OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 217974cb: am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has...
Alan Viverette [Mon, 1 Jun 2015 19:05:32 +0000 (19:05 +0000)]
am 217974cb: am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

* commit '217974cbe7e7dc68d352a0d7820a170a5d5a532c':
  Prevent crash when ColorStateList has unresolved attrs

9 years agoam ccb8616a: am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available...
Yin-Chia Yeh [Mon, 1 Jun 2015 19:05:25 +0000 (19:05 +0000)]
am ccb8616a: am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

* commit 'ccb8616ab382e4f33a1416ab09baa593a2af3dbd':
  Camera2: Add missing LEGACY available keys

9 years agoam d022459b: am 18fa9176: am 0de6dea6: Merge "No need to specify key size when import...
Alex Klyubin [Mon, 1 Jun 2015 19:05:18 +0000 (19:05 +0000)]
am d022459b: am 18fa9176: am 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev

* commit 'd022459bb9228658491874feda072e0733df05de':
  No need to specify key size when importing.

9 years agoam ab21d60c: am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable...
Andres Morales [Mon, 1 Jun 2015 19:05:12 +0000 (19:05 +0000)]
am ab21d60c: am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

* commit 'ab21d60c240fb2ef773cf4dda1ff5a4e7f4592d3':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

9 years agoam e573a5e2: am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess...
Chien-Yu Chen [Mon, 1 Jun 2015 19:05:03 +0000 (19:05 +0000)]
am e573a5e2: am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

* commit 'e573a5e23f393f780c8015bdbac37a1646f40f6f':
  Camera2: update docs for reprocess timestamp

9 years agoam c820559a: am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight...
Alan Viverette [Mon, 1 Jun 2015 19:04:57 +0000 (19:04 +0000)]
am c820559a: am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

* commit 'c820559a916ff4bc245b7eb15a2109c00bb6f174':
  Don't ignore explicit dividerHeight of 0 specified in XML

9 years agoam b88314ad: am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling...
Alan Viverette [Mon, 1 Jun 2015 19:04:51 +0000 (19:04 +0000)]
am b88314ad: am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

* commit 'b88314ad72669c2b91f2e5c6edf73f8ed02f0024':
  Fix row/column order when unparcelling CollectionItemInfo

9 years agoam c96a66dd: am 378c2cbf: am e3e314df: Network Reset should have a lockdown like...
Stuart Scott [Mon, 1 Jun 2015 19:04:44 +0000 (19:04 +0000)]
am c96a66dd: am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset.

* commit 'c96a66dd03b7928e0945dc7ff0ce961d7091fc7d':
  Network Reset should have a lockdown like Factory Reset.

9 years agoam 7ce1850e: am 2f752f8f: am 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android...
Joe Fernandez [Mon, 1 Jun 2015 19:04:37 +0000 (19:04 +0000)]
am 7ce1850e: am 2f752f8f: am 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '7ce1850e5ad45c783072bcf0ab4fd6121c4c94fb':
  docs: Android Dashboard - June 2015 update

9 years agoam 33021658: am 2e7e5c1c: am 48fe2631: resolved conflicts for merge of a61e23f1 to...
Filip Gruszczynski [Mon, 1 Jun 2015 19:04:33 +0000 (19:04 +0000)]
am 33021658: am 2e7e5c1c: am 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev

* commit '330216583777ff1617d3316bd7dcb43a02061b57':
  Only use outsets for full screen windows.

9 years agoam fae785fc: am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY...
Mady Mellor [Mon, 1 Jun 2015 19:04:27 +0000 (19:04 +0000)]
am fae785fc: am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

* commit 'fae785fccf151aab7fba0daa701915f9e223fdfe':
  Update button to BUTTON_STYLUS_PRIMARY

9 years agoam ee8ac623: am 8c189479: am ef24bc00: Merge "Update stylus button press recognition...
Mady Mellor [Mon, 1 Jun 2015 19:04:22 +0000 (19:04 +0000)]
am ee8ac623: am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev

* commit 'ee8ac623edee9352fdbf2f653af564a9df8514d2':
  Update stylus button press recognition in View to use new MotionEvent APIs

9 years agoam 36ffd6d6: am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition...
Mady Mellor [Mon, 1 Jun 2015 19:04:15 +0000 (19:04 +0000)]
am 36ffd6d6: am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev

* commit '36ffd6d6b68d577903a3a71f8742779379e6d54c':
  Update stylus button press recognition in GestureDetector to use new APIs

9 years agoam 201c74ef: am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into...
Filip Gruszczynski [Mon, 1 Jun 2015 19:04:10 +0000 (19:04 +0000)]
am 201c74ef: am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev

* commit '201c74ef59d657660b2f8018091786bb63729534':
  Revert "Revert "Fix build.""

9 years agoam 3ef3a050: am b42f1007: am b3054109: am 67725e2a: am 7f6da0c3: add back the GMS...
smain@google.com [Mon, 1 Jun 2015 19:04:05 +0000 (19:04 +0000)]
am 3ef3a050: am b42f1007: am b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

* commit '3ef3a050b682f1783049815939848035f0f7e408':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

9 years agoam 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts...
Filip Gruszczynski [Mon, 1 Jun 2015 19:03:59 +0000 (19:03 +0000)]
am 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

9 years agoam c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved...
Alan Viverette [Mon, 1 Jun 2015 18:51:48 +0000 (18:51 +0000)]
am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

* commit 'c6296a76869422fd698ada889a74bc3129792db5':
  Prevent crash when ColorStateList has unresolved attrs

9 years agoam 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into...
Yin-Chia Yeh [Mon, 1 Jun 2015 18:51:43 +0000 (18:51 +0000)]
am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

* commit '21f55342d60e54c9e899aa746cf1a848f2910e61':
  Camera2: Add missing LEGACY available keys

9 years agoam 18fa9176: am 0de6dea6: Merge "No need to specify key size when importing." into...
Alex Klyubin [Mon, 1 Jun 2015 18:51:38 +0000 (18:51 +0000)]
am 18fa9176: am 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev

* commit '18fa91765a00925787ee9214ad044dac28c77b76':
  No need to specify key size when importing.

9 years agoam 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage...
Andres Morales [Mon, 1 Jun 2015 18:51:32 +0000 (18:51 +0000)]
am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

9 years agoam a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into...
Chien-Yu Chen [Mon, 1 Jun 2015 18:51:27 +0000 (18:51 +0000)]
am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

* commit 'a56dee8edecddfe298d348c4006de6dea0e92374':
  Camera2: update docs for reprocess timestamp

9 years agoam af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified...
Alan Viverette [Mon, 1 Jun 2015 18:51:12 +0000 (18:51 +0000)]
am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

* commit 'af3134ae74538bf716da8ecdc0a07f29e5bdc145':
  Don't ignore explicit dividerHeight of 0 specified in XML

9 years agoam 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionIte...
Alan Viverette [Mon, 1 Jun 2015 18:50:46 +0000 (18:50 +0000)]
am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo

9 years agoam 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 1 Jun 2015 18:50:39 +0000 (18:50 +0000)]
am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset.

* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.

9 years agoam 2f752f8f: am 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard...
Joe Fernandez [Mon, 1 Jun 2015 18:50:30 +0000 (18:50 +0000)]
am 2f752f8f: am 540d0e0d: am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '2f752f8f771c269d5e2486067569d78850f105b5':
  docs: Android Dashboard - June 2015 update

9 years agoam 2e7e5c1c: am 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 18:50:25 +0000 (18:50 +0000)]
am 2e7e5c1c: am 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev

* commit '2e7e5c1cbfeea58e5d083679a857d75c090f3289':
  Only use outsets for full screen windows.

9 years agoam 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 18:50:15 +0000 (18:50 +0000)]
am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

* commit '8de52276a1f5faf83ea8147f0ddee74195279bba':
  Update button to BUTTON_STYLUS_PRIMARY

9 years agoam 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to...
Mady Mellor [Mon, 1 Jun 2015 18:50:09 +0000 (18:50 +0000)]
am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev

* commit '8c189479a02dfae2874a622dd79abcbcded0c809':
  Update stylus button press recognition in View to use new MotionEvent APIs

9 years agoam ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDet...
Mady Mellor [Mon, 1 Jun 2015 18:50:04 +0000 (18:50 +0000)]
am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev

* commit 'ed836decd81c2b8d894bf2fd658f45a761f795cd':
  Update stylus button press recognition in GestureDetector to use new APIs

9 years agoam 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:58 +0000 (18:49 +0000)]
am 6f68b90e: am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev

* commit '6f68b90ebf7714a628b110a2c4c534c17d7e20d2':
  Revert "Revert "Fix build.""

9 years agoam b42f1007: am b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM referenc...
smain@google.com [Mon, 1 Jun 2015 18:49:53 +0000 (18:49 +0000)]
am b42f1007: am b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

* commit 'b42f1007b3227ba2b1b20590031585f9603c3f94':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1

9 years agoam 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of...
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:47 +0000 (18:49 +0000)]
am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

9 years agoam 1ebfbc08: (-s ours) am 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 18:25:35 +0000 (18:25 +0000)]
am 1ebfbc08: (-s ours) am 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '1ebfbc08c0b7a793dc46fd5c4a0397ac617930f5':
  Import translations. DO NOT MERGE

9 years agoam 707cd546: (-s ours) am 32b0118a: (-s ours) am e4a9ecb2: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 18:25:30 +0000 (18:25 +0000)]
am 707cd546: (-s ours) am 32b0118a: (-s ours) am e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '707cd5467053fb2bf2f5d03e1c0ec3f1299dc51c':
  Import translations. DO NOT MERGE

9 years agoam 3f359dc1: am 2b5002e6: am a58b9a2c: Merge "Battery saver: limit notification inten...
John Spurlock [Mon, 1 Jun 2015 18:25:25 +0000 (18:25 +0000)]
am 3f359dc1: am 2b5002e6: am a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev

* commit '3f359dc1c86b68bee42e232f4b8595f6b3adc565':
  Battery saver: limit notification intents to system UI.

9 years agoam be5bf201: am 5e5a408c: am 4bd071e5: Merge "Shortened the duration of HUNs" into...
Selim Cinek [Mon, 1 Jun 2015 18:25:19 +0000 (18:25 +0000)]
am be5bf201: am 5e5a408c: am 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev

* commit 'be5bf201fb0c9018d7caaeeb5939db3aaf2b8ace':
  Shortened the duration of HUNs

9 years agoam 3a367a05: am 91ef6a2e: am 3b7f9615: Merge "Fix javadocs based on recent case consi...
Neil Fuller [Mon, 1 Jun 2015 18:25:14 +0000 (18:25 +0000)]
am 3a367a05: am 91ef6a2e: am 3b7f9615: Merge "Fix javadocs based on recent case consistency change" into mnc-dev

* commit '3a367a052117d933682bfa7df0003f79304ca679':
  Fix javadocs based on recent case consistency change

9 years agoam 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 18:14:23 +0000 (18:14 +0000)]
am 07ec79d2: (-s ours) am c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '07ec79d269bf565becb2eb096dc28c1bb953a4be':
  Import translations. DO NOT MERGE

9 years agoam 32b0118a: (-s ours) am e4a9ecb2: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 18:14:18 +0000 (18:14 +0000)]
am 32b0118a: (-s ours) am e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '32b0118ab1dd92fb02bb20e12d6c7f9f97cabf88':
  Import translations. DO NOT MERGE

9 years agoam 2b5002e6: am a58b9a2c: Merge "Battery saver: limit notification intents to system...
John Spurlock [Mon, 1 Jun 2015 18:14:10 +0000 (18:14 +0000)]
am 2b5002e6: am a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev

* commit '2b5002e6317ba2a7417622800886e877df33818f':
  Battery saver: limit notification intents to system UI.

9 years agoam 5e5a408c: am 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
Selim Cinek [Mon, 1 Jun 2015 18:14:05 +0000 (18:14 +0000)]
am 5e5a408c: am 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev

* commit '5e5a408c4c696ade7e97fc290830fc078653ceee':
  Shortened the duration of HUNs

9 years agoam 91ef6a2e: am 3b7f9615: Merge "Fix javadocs based on recent case consistency change...
Neil Fuller [Mon, 1 Jun 2015 18:13:39 +0000 (18:13 +0000)]
am 91ef6a2e: am 3b7f9615: Merge "Fix javadocs based on recent case consistency change" into mnc-dev

* commit '91ef6a2e9d813900c5f417caff3f32fc9780b911':
  Fix javadocs based on recent case consistency change

9 years agoam 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into...
Alan Viverette [Mon, 1 Jun 2015 18:05:09 +0000 (18:05 +0000)]
am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

* commit '0ee2c1aef93987663968dbfd693cc5eda06c8244':
  Prevent crash when ColorStateList has unresolved attrs

9 years agoam 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 18:05:05 +0000 (18:05 +0000)]
am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

* commit '254ed616712866518225dbc156182f39339e76a4':
  Camera2: Add missing LEGACY available keys

9 years agoam 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 18:05:00 +0000 (18:05 +0000)]
am 0de6dea6: Merge "No need to specify key size when importing." into mnc-dev

* commit '0de6dea6fb0c3b87e967c4c223f5edda359d1c8c':
  No need to specify key size when importing.

9 years agoam 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader,...
Andres Morales [Mon, 1 Jun 2015 18:04:56 +0000 (18:04 +0000)]
am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

* commit '0fddb1a63109e2d4a92327ea1ffc74307292be48':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

9 years agoam 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 18:04:48 +0000 (18:04 +0000)]
am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

* commit '61bae6d8de096c8982074ac507554fda42a802a5':
  Camera2: update docs for reprocess timestamp

9 years agoMerge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev

9 years agoMerge "Camera2: Add missing LEGACY available keys" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 17:53:40 +0000 (17:53 +0000)]
Merge "Camera2: Add missing LEGACY available keys" into mnc-dev

9 years agoMerge "No need to specify key size when importing." into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 17:53:28 +0000 (17:53 +0000)]
Merge "No need to specify key size when importing." into mnc-dev

9 years agoMerge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery...
Andres Morales [Mon, 1 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev

9 years agoMerge "Camera2: update docs for reprocess timestamp" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 17:50:54 +0000 (17:50 +0000)]
Merge "Camera2: update docs for reprocess timestamp" into mnc-dev

9 years agoRevert "[partition checking] re-enable bootimage/bootloader, add recovery"
Andres Morales [Mon, 1 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"

This reverts commit 831e01a89e9636baf15d35e7f8ff5e9f290c8b87.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a

9 years agoPrevent crash when ColorStateList has unresolved attrs
Alan Viverette [Mon, 1 Jun 2015 17:45:49 +0000 (10:45 -0700)]
Prevent crash when ColorStateList has unresolved attrs

Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a

9 years agoCamera2: Add missing LEGACY available keys
Yin-Chia Yeh [Thu, 28 May 2015 22:58:22 +0000 (15:58 -0700)]
Camera2: Add missing LEGACY available keys

Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1

9 years agoam 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into...
Alan Viverette [Mon, 1 Jun 2015 17:44:03 +0000 (17:44 +0000)]
am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

* commit '9be801c8269358ded8e4bed6103ca2346da7e179':
  Don't ignore explicit dividerHeight of 0 specified in XML

9 years agoMerge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 17:33:15 +0000 (17:33 +0000)]
Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev

9 years agoDon't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 17:30:21 +0000 (10:30 -0700)]
Don't ignore explicit dividerHeight of 0 specified in XML

Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15

9 years agoam 413cd5a3: am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE
Erik Kline [Mon, 1 Jun 2015 17:26:54 +0000 (17:26 +0000)]
am 413cd5a3: am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE

* commit '413cd5a329a9d747bff4a7187c2daf9636f37049':
  Treat RTM_DELNEIGH as a transition to NUD_NONE

9 years agoam a1243ac6: (-s ours) am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:49 +0000 (17:26 +0000)]
am a1243ac6: (-s ours) am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a1243ac690b5f07ee1cba9bad71dfffd6f6eb2a6':
  Import translations. DO NOT MERGE

9 years agoam e7fc3ccd: (-s ours) am f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:42 +0000 (17:26 +0000)]
am e7fc3ccd: (-s ours) am f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e7fc3ccdfbcfb5ec0013294b347b4c55403d9cd7':
  Import translations. DO NOT MERGE

9 years agoam cc5c15d7: (-s ours) am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:36 +0000 (17:26 +0000)]
am cc5c15d7: (-s ours) am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cc5c15d7e24c7ee06920dc8ca0ccfdce1fccd722':
  Import translations. DO NOT MERGE

9 years agoam 9de5f5bd: (-s ours) am 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:30 +0000 (17:26 +0000)]
am 9de5f5bd: (-s ours) am 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9de5f5bdefc094afec6846cd49287bdcba0c6dd7':
  Import translations. DO NOT MERGE

9 years agoam c8277c87: (-s ours) am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:23 +0000 (17:26 +0000)]
am c8277c87: (-s ours) am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c8277c87e95568fa828af6fda1ad37f371341ea1':
  Import translations. DO NOT MERGE

9 years agoam 7650618a: (-s ours) am 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:17 +0000 (17:26 +0000)]
am 7650618a: (-s ours) am 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '7650618a60452e0c14835f811450205bda38762d':
  Import translations. DO NOT MERGE

9 years agoam b69b44c9: (-s ours) am 780ec6a2: (-s ours) am ec83bc71: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:11 +0000 (17:26 +0000)]
am b69b44c9: (-s ours) am 780ec6a2: (-s ours) am ec83bc71: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'b69b44c9e89f6c4c1c5298b60f33c27805d48fac':
  Import translations. DO NOT MERGE

9 years agoam 9eeae334: (-s ours) am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:26:05 +0000 (17:26 +0000)]
am 9eeae334: (-s ours) am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9eeae3346f92865d724ae3ea8b41c6ac63eb462c':
  Import translations. DO NOT MERGE

9 years agoam 5ac716cc: (-s ours) am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:25:58 +0000 (17:25 +0000)]
am 5ac716cc: (-s ours) am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5ac716cc686d4cfa230a155218f51344434c9a41':
  Import translations. DO NOT MERGE

9 years agoam f63a742a: (-s ours) am a6eda952: (-s ours) am a35e790d: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:25:52 +0000 (17:25 +0000)]
am f63a742a: (-s ours) am a6eda952: (-s ours) am a35e790d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f63a742af1c81dfe44579b7e7b5fd7f90ad7e612':
  Import translations. DO NOT MERGE

9 years agoam cb9c23f6: (-s ours) am 62d28b7a: (-s ours) am 998b1c45: (-s ours) Merge "Import...
Geoff Mendal [Mon, 1 Jun 2015 17:25:46 +0000 (17:25 +0000)]
am cb9c23f6: (-s ours) am 62d28b7a: (-s ours) am 998b1c45: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cb9c23f609712676a3215e8ce136ac931343e5a8':
  Import translations. DO NOT MERGE

9 years agoam fab12f20: am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation...
Barnaby James [Mon, 1 Jun 2015 17:25:39 +0000 (17:25 +0000)]
am fab12f20: am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev

* commit 'fab12f200a1420d13ac03fbd22b29e5fbca9624f':
  Minor VoiceInteractor documentation fixes.

9 years agoam 819bf267: am 1bf1af04: am d659f450: Fix the build months later?
Jeff Sharkey [Mon, 1 Jun 2015 17:25:34 +0000 (17:25 +0000)]
am 819bf267: am 1bf1af04: am d659f450: Fix the build months later?

* commit '819bf2675518585b529943603d46df1d4e50e6b1':
  Fix the build months later?

9 years agoam 28c48192: am 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview...
Joe Fernandez [Mon, 1 Jun 2015 17:25:28 +0000 (17:25 +0000)]
am 28c48192: am 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview - Update volantis download signatures

* commit '28c48192b37fd8e4bfc1e89a96526b4f75b7a964':
  docs: M Preview - Update volantis download signatures

9 years agoam c5d46246: am 143c97b2: am 2b184e86: Merge "Reduce amount of unnecessary RippleDraw...
Alan Viverette [Mon, 1 Jun 2015 17:25:21 +0000 (17:25 +0000)]
am c5d46246: am 143c97b2: am 2b184e86: Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev

* commit 'c5d46246c6006e8d60ba037b553181569e480a41':
  Reduce amount of unnecessary RippleDrawable mask redraw

9 years agoam ee7c2fc9: am 3d4db82c: am 765389ec: am c5abcba4: am 820f2501: Merge "docs: Quick...
Andrew Solovay [Mon, 1 Jun 2015 17:25:16 +0000 (17:25 +0000)]
am ee7c2fc9: am 3d4db82c: am 765389ec: am c5abcba4: am 820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs

* commit 'ee7c2fc92c9f5f4738d4e06a0f02df0143c38128':
  docs: Quick fixes for the M Preview "Setup SDK" page.

9 years agoam ba790168: am b5b6633a: am 538aabc1: am 270d4a70: am acb470be: am 490f8761: am...
David Friedman [Mon, 1 Jun 2015 17:25:09 +0000 (17:25 +0000)]
am ba790168: am b5b6633a: am 538aabc1: am 270d4a70: am acb470be: am 490f8761: am 7b3ecd65: Merge "Quick typo fix." into lmp-docs

* commit 'ba790168eb7739e82d317355efdc6ca1a72f84d5':
  Quick typo fix.

9 years agoam 0603b30e: am 829159f1: am 996458b7: Fix ParserFactory not initialized error.
Deepanshu Gupta [Mon, 1 Jun 2015 17:25:04 +0000 (17:25 +0000)]
am 0603b30e: am 829159f1: am 996458b7: Fix ParserFactory not initialized error.

* commit '0603b30e17dbdee1d6b6fd0faabd8272a909ec08':
  Fix ParserFactory not initialized error.

9 years agoam 9d24d2ea: am 159f6ccd: am e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: support...
Joe Fernandez [Mon, 1 Jun 2015 17:24:57 +0000 (17:24 +0000)]
am 9d24d2ea: am 159f6ccd: am e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs

* commit '9d24d2ea182edfb314311949b2dd58e2fc388ddc':
  docs: supportlib 22.2.0 design version update

9 years agoam 64f5d4f0: am d9597642: am 512234f1: Merge "Close input session when the view is...
Yohei Yukawa [Mon, 1 Jun 2015 17:24:47 +0000 (17:24 +0000)]
am 64f5d4f0: am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev

* commit '64f5d4f0311d9ac61a432d4a37948c55ae42bc2c':
  Close input session when the view is detached from the window.

9 years agoam 9b564b91: am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling
Christopher Tate [Mon, 1 Jun 2015 17:24:40 +0000 (17:24 +0000)]
am 9b564b91: am d323f6cf: am 3d7e0d8e: Adjust key/value backup scheduling

* commit '9b564b913234021d87df26f104b7617e62503377':
  Adjust key/value backup scheduling

9 years agoam 19d50b8f: am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start...
Jeff Brown [Mon, 1 Jun 2015 17:24:27 +0000 (17:24 +0000)]
am 19d50b8f: am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev

* commit '19d50b8f796df8e547b6c72662ab6086971b480e':
  Tell PhoneWindowManager when we start/finish interactive changes.

9 years agoam 82b45589: am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in packag...
Doris Liu [Mon, 1 Jun 2015 17:24:20 +0000 (17:24 +0000)]
am 82b45589: am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev

* commit '82b455892c6a7f228cf444f6cd949f0edeade113':
  Fix calls to Rect.intersect() in package android.view

9 years agoam bc0cb7c7: am e89fe7a3: am 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust...
Dirk Dougherty [Mon, 1 Jun 2015 17:24:13 +0000 (17:24 +0000)]
am bc0cb7c7: am e89fe7a3: am 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust permissions language.

* commit 'bc0cb7c7fb2df54be5d87a9084bb299ee1a7f5df':
  Fix a date, adjust permissions language.

9 years agoam e2fa70ea: am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animati...
Alan Viverette [Mon, 1 Jun 2015 17:24:06 +0000 (17:24 +0000)]
am e2fa70ea: am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev

* commit 'e2fa70eaea00ad07c39a2ce472c2df42db1c6b1c':
  Replace PNG-based seekbar thumb animation with AVD

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 17:16:48 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoam 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE
Erik Kline [Mon, 1 Jun 2015 17:11:37 +0000 (17:11 +0000)]
am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE

* commit '8ef5ac13abf3602c195ea972a9c5ce5626d1a6dd':
  Treat RTM_DELNEIGH as a transition to NUD_NONE

9 years agoam e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:11:24 +0000 (17:11 +0000)]
am e438183d: (-s ours) am 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e438183d84839f5d02962770bf456f846f9645ef':
  Import translations. DO NOT MERGE

9 years agoam f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:11:18 +0000 (17:11 +0000)]
am f8db2d7c: (-s ours) am d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f8db2d7cd09adf8ad4cd1e205c0bdfb90e8af76f':
  Import translations. DO NOT MERGE

9 years agoam 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:11:12 +0000 (17:11 +0000)]
am 392acb98: (-s ours) am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '392acb98acf86cbcca2e50c545d6d77f821ec1f8':
  Import translations. DO NOT MERGE

9 years agoam 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:11:07 +0000 (17:11 +0000)]
am 52ebe172: (-s ours) am edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '52ebe172a7ab26fa9513393c277ea19c8c43fa3c':
  Import translations. DO NOT MERGE

9 years agoam 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)]
am 2865ce0e: (-s ours) am 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2865ce0e85c4b9b969de9d08a22710ddd4eb5373':
  Import translations. DO NOT MERGE

9 years agoam 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:54 +0000 (17:10 +0000)]
am 2ccc33c5: (-s ours) am 5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2ccc33c5449a05892a41e0f6a12cbf43fba2f463':
  Import translations. DO NOT MERGE

9 years agoam 780ec6a2: (-s ours) am ec83bc71: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:49 +0000 (17:10 +0000)]
am 780ec6a2: (-s ours) am ec83bc71: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '780ec6a29aecd1fa71276de4bda8deb6f49bc7e3':
  Import translations. DO NOT MERGE

9 years agoam b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:42 +0000 (17:10 +0000)]
am b1dfd97f: (-s ours) am 3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'b1dfd97f476d07bbf1381983399e7b21e930c870':
  Import translations. DO NOT MERGE

9 years agoam e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:35 +0000 (17:10 +0000)]
am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e3a25165a4dae32a4081d7fa886607269719cfb4':
  Import translations. DO NOT MERGE

9 years agoam a6eda952: (-s ours) am a35e790d: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:13 +0000 (17:10 +0000)]
am a6eda952: (-s ours) am a35e790d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a6eda952908cc9d01935937ebbcd3dd4460c48dc':
  Import translations. DO NOT MERGE

9 years agoam 62d28b7a: (-s ours) am 998b1c45: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 1 Jun 2015 17:10:07 +0000 (17:10 +0000)]
am 62d28b7a: (-s ours) am 998b1c45: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '62d28b7aaf1b357be31df6a03e55b9d836be9a80':
  Import translations. DO NOT MERGE

9 years agoam 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into...
Barnaby James [Mon, 1 Jun 2015 17:09:02 +0000 (17:09 +0000)]
am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev

* commit '4ead90a1c200f144e91d176b4c1627b1bad37f45':
  Minor VoiceInteractor documentation fixes.

9 years agoam 1bf1af04: am d659f450: Fix the build months later?
Jeff Sharkey [Mon, 1 Jun 2015 17:08:43 +0000 (17:08 +0000)]
am 1bf1af04: am d659f450: Fix the build months later?

* commit '1bf1af0492459ff77cd6b901329eb13f3507bb1e':
  Fix the build months later?

9 years agoam 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview - Update volantis...
Joe Fernandez [Mon, 1 Jun 2015 17:08:33 +0000 (17:08 +0000)]
am 7045b392: am 3bacb4d8: am 0e997308: am e2ee9b6b: docs: M Preview - Update volantis download signatures

* commit '7045b392780d12ff051e53a98cbf76b35b24df39':
  docs: M Preview - Update volantis download signatures