Eino-Ville Talvala
028c2e4e26
am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
...
* commit '33689420d13283f192c66ca7e78776064a2def28':
Camera2: Add camera type to getNumberOfCameras.
2015-08-16 02:49:17 +00:00
Quddus Chong
5530de16b6
am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '9f18c69cfe446b5af216a97ce00c88237f4a61f1':
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-16 02:49:12 +00:00
Joe Fernandez
687a3025c8
am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
...
* commit '674e5eb0eb3c4bc4a624924affd4e02ccf1b0083':
docs: API diff report 22 to 23
2015-08-16 02:49:06 +00:00
Andrew Solovay
835032bba5
am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
...
* commit '24e0560169f78666c855cee0cdbeb758e773a5ec':
docs: Added Javadoc links for new M Preview permissions methods
2015-08-16 02:49:00 +00:00
David Friedman
244898ff9d
am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev
...
* commit '83f941b24143b71c77885d91d95e34fa14f1da03':
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
2015-08-16 02:48:54 +00:00
Dianne Hackborn
914eda0070
am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
...
* commit '574f9b42da2093823f5b0a7da1fbae9b2b38ba8d':
Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo...
2015-08-16 02:48:48 +00:00
Andrew Solovay
d81e103a12
am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev
...
* commit '83e0a223610be6fc38e39c40326e6a8a89f346fa':
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
2015-08-16 02:48:43 +00:00
Adam Lesinski
6df21b51b1
am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
...
* commit '085a6b42f49141089c142ae5364515af15a22f62':
AAPT: Fix regression in resource versioning
2015-08-16 02:48:37 +00:00
Quddus Chong
5abde23cf5
am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit 'ef7e8ccb185dbcddec29259c7a6a8b58096ecf52':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 02:48:32 +00:00
Daniel Sandler
98e684e7f4
am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit 'b66e755bdba57f163f25d08c207ef598eea7edae':
Introducing M Land.
2015-08-16 02:48:26 +00:00
Dan Sandler
87c1e1b8a1
am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '415c6cb2358a0ad4821ec58c287b1de94de78d72':
"I tried to think of the most harmless thing."
2015-08-16 02:48:19 +00:00
Geoff Mendal
92f58f7cfc
am 567139ef: am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev
...
* commit '567139efb31c3b5661206fb1a72087e560c4ab48':
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
2015-08-16 02:45:23 +00:00
Geoff Mendal
567139efb3
am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev
...
* commit 'a5e012e6236aaeabd6d00fa7c6b29ec146ffd764':
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
2015-08-16 02:39:19 +00:00
Eino-Ville Talvala
33689420d1
am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
...
* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
Camera2: Add camera type to getNumberOfCameras.
2015-08-16 02:37:19 +00:00
Quddus Chong
9f18c69cfe
am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit 'a99dd2c94448efc246ee2326912532f20bb38311':
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-16 02:37:14 +00:00
Joe Fernandez
674e5eb0eb
am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
...
* commit 'd4828d676d357a517cc5eecab86a59fd5fcba567':
docs: API diff report 22 to 23
2015-08-16 02:37:10 +00:00
Andrew Solovay
24e0560169
am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
...
* commit '186c4c2f1d4713b01b0b37e6a043e9621c9d25a6':
docs: Added Javadoc links for new M Preview permissions methods
2015-08-16 02:37:06 +00:00
David Friedman
83f941b241
am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev
...
* commit 'f8134c85fed397770c68c86f0169c9fe46ccb7e9':
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
2015-08-16 02:37:02 +00:00
Dianne Hackborn
574f9b42da
am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
...
* commit 'ac11522e540422d3afc691af5510da14ab7a3d40':
Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo...
2015-08-16 02:36:58 +00:00
Andrew Solovay
83e0a22361
am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev
...
* commit '7a3727671eb100c0e5d0dd663ff981f4f19e9a2e':
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
2015-08-16 02:36:54 +00:00
Adam Lesinski
085a6b42f4
am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
...
* commit '89a3c5ad7508f5370126ef8454a6153f8d56bf37':
AAPT: Fix regression in resource versioning
2015-08-16 02:36:50 +00:00
Quddus Chong
ef7e8ccb18
am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit '791def59b9858efd1334da5d01fb906051dcc028':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 02:36:45 +00:00
Daniel Sandler
b66e755bdb
am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit '64b05c0fd413d481cea19e9590732e8219a60912':
Introducing M Land.
2015-08-16 02:36:39 +00:00
Dan Sandler
415c6cb235
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
"I tried to think of the most harmless thing."
2015-08-16 02:36:17 +00:00
Geoff Mendal
a5e012e623
Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev
2015-08-15 19:25:34 -07:00
Eino-Ville Talvala
eec25a4ffe
am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
...
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
Camera2: Add camera type to getNumberOfCameras.
2015-08-16 01:34:42 +00:00
Quddus Chong
a99dd2c944
am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
...
* commit '6fa531e0153d9b76994adbc631fed0a591e7ef93':
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
2015-08-16 01:34:22 +00:00
Joe Fernandez
d4828d676d
am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev
...
* commit 'fbf170cb1038d73138e4b73cee26cdd18a150ee3':
docs: API diff report 22 to 23
2015-08-16 01:34:18 +00:00
Andrew Solovay
186c4c2f1d
am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
...
* commit '886e382dd8fd08ba1dcdc7dee2f462026b872b41':
docs: Added Javadoc links for new M Preview permissions methods
2015-08-16 01:34:13 +00:00
David Friedman
f8134c85fe
am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev
...
* commit '5bd5c25ee509a095a823896b51fd897bbe0871c9':
Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123
2015-08-16 01:34:08 +00:00
Dianne Hackborn
ac11522e54
am 06f552cf: Merge "Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo..." into mnc-dev
...
* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
Add debugging for issue #23190084 : [APPComm][Dev Test] {Unable to share photo...
2015-08-16 01:34:04 +00:00
Andrew Solovay
7a3727671e
am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev
...
* commit 'eee09f495fa135c327429a9649908b0b40ac8754':
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
2015-08-16 01:33:55 +00:00
Adam Lesinski
89a3c5ad75
am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
...
* commit '0cd143adae642465a26a7eaac96030bb18826e94':
AAPT: Fix regression in resource versioning
2015-08-16 01:33:48 +00:00
Quddus Chong
791def59b9
am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
...
* commit 'b8fb239ac53ab462c8de12635c84c2216cf57f3b':
docs: Updated API Overview and Behavior Changes docs for M Preview 3.
2015-08-16 01:33:44 +00:00
Daniel Sandler
64b05c0fd4
am 9f238a94: Merge "Introducing M Land." into mnc-dev
...
* commit '9f238a9455639fccb6f44abd03752e3bb3bbc91e':
Introducing M Land.
2015-08-16 01:33:37 +00:00
Dan Sandler
8c8387d235
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
2015-08-15 18:33:29 -04:00
Daniel Sandler
8dcda391c7
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev
...
Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7
2015-08-15 00:03:09 -07:00
Seigo Nonaka
e27dc2b09d
Use android.os.Debug.getCallers instead of self implementation.
...
This changes debug message format but does not change any other behavior.
Maintaining InputMethodUtils.getStackTrace() doesn't make much sense
because we already have a similar method in android.os.Debug.
since there is already utility function in Android. The length 10 is
sufficient for identifying caller modules.
getStackTrace() is introduced by
Ib23849d352db33f0747aa9d5a178f00ac726c13b just for debugging purpose as a
part of Bug 6931482.
Bug: 22285167
Change-Id: If3a6c0d2f51dc3774eef14b4f496b5b59ddcf5a6
2015-08-14 22:51:22 -07:00
Dan Albert
997c829ccd
am 78c2711a: Merge "Fix pessimizing move." into mnc-dr-dev-plus-aosp
...
* commit '78c2711ae3396dfed9fee76e52db5ff7241fb071':
Fix pessimizing move.
2015-08-15 03:23:03 +00:00
Dan Albert
78c2711ae3
Merge "Fix pessimizing move." into mnc-dr-dev-plus-aosp
2015-08-15 03:17:32 +00:00
Jean-Luc Brouillet
8bf69a4867
Update the RenderScript runtime documentation for MNC.
...
Update the documentation to include the features introduced in MNC.
b/23190418
Change-Id: I2c6dc11029a9bc0c2ca9bb8b712d4fd4660c3b29
2015-08-14 18:18:15 -07:00
Eino-Ville Talvala
1017f9862f
Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
2015-08-15 00:46:15 +00:00
Seigo Nonaka
dda53bf065
Merge "Move parseInputMethodsAndSubtypesString to InputMethodUtils."
2015-08-15 00:38:27 +00:00
Chris Craik
b2043cace7
am 8910175f: am 63d3a610: (-s ours) am e3f0a881: Merge "Make the value for shadowRadius less than 1.0 work"
...
* commit '8910175f0bae744ab58cf1ea4a124f84f476e308':
Make the value for shadowRadius less than 1.0 work
2015-08-14 23:30:28 +00:00
Quddus Chong
6fa531e015
Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
2015-08-14 23:06:22 +00:00
Quddus Chong
44d911ffe2
docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery.
...
Change-Id: Ib9a36ce62b137316ae2b8bc626a0b0377f593a21
2015-08-14 15:59:07 -07:00
Joe Fernandez
fbf170cb10
Merge "docs: API diff report 22 to 23" into mnc-dev
2015-08-14 22:57:17 +00:00
Andrew Solovay
886e382dd8
Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev
2015-08-14 22:52:22 +00:00
Wale Ogunwale
65026ee050
Merge "Added am commands for testing task positioning/resizing"
2015-08-14 22:50:13 +00:00
David Friedman
5bd5c25ee5
Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev
2015-08-14 22:49:39 +00:00
