OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute...
Wale Ogunwale [Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)]
am 4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

* commit '4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
  Allow app to stop lockTaskMode if started by manifest attribute

9 years agoMerge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev

9 years agoAllow app to stop lockTaskMode if started by manifest attribute
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute

It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.

Bug: 21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2

9 years agoam 6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am 6920474b: Merge "Ensuring that we write to disk first." into mnc-dev

* commit '6920474bac7c212dd384b6ef1134c59b73669942':
  Ensuring that we write to disk first.

9 years agoam a74f385b: Allow long-pressing task icon to show app-info.
Winson Chung [Mon, 1 Jun 2015 18:23:37 +0000 (18:23 +0000)]
am a74f385b: Allow long-pressing task icon to show app-info.

* commit 'a74f385ba08922c09aa812f0d6fd2903a633da01':
  Allow long-pressing task icon to show app-info.

9 years agoMerge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev

9 years agoEnsuring that we write to disk first.
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.

Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2

9 years agoAllow long-pressing task icon to show app-info.
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.

Bug: 17369696

9 years agoam 064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
Yorke Lee [Mon, 1 Jun 2015 18:05:15 +0000 (18:05 +0000)]
am 064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev

* commit '064fc83b81e215881c2ad22827741e6e9142f948':
  Add ability to modify default dialer via ADB

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 "Add ability to modify default dialer via ADB" into mnc-dev
Yorke Lee [Mon, 1 Jun 2015 18:00:49 +0000 (18:00 +0000)]
Merge "Add ability to modify default dialer via ADB" into mnc-dev

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 agoNo need to specify key size when importing.
Alex Klyubin [Mon, 1 Jun 2015 16:52:16 +0000 (09:52 -0700)]
No need to specify key size when importing.

The underlying Keymaster implementation no longer requires that.

Bug: 19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749

9 years agoam 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into...
Alan Viverette [Mon, 1 Jun 2015 16:44:03 +0000 (16:44 +0000)]
am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

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

9 years agoam e3e314df: Network Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 1 Jun 2015 16:43:58 +0000 (16:43 +0000)]
am e3e314df: Network Reset should have a lockdown like Factory Reset.

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

9 years agoMerge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev

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

* commit '540d0e0d834da68bfd6377dd35ed29ed1765d106':
  docs: Android Dashboard - June 2015 update

9 years agoam 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:33:17 +0000 (16:33 +0000)]
am 48fe2631: resolved conflicts for merge of a61e23f1 to mnc-dev

* commit '48fe2631373931d8ab4a403791dd09394519acf6':
  Only use outsets for full screen windows.

9 years agoNetwork Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 20 Apr 2015 21:07:45 +0000 (14:07 -0700)]
Network Reset should have a lockdown like Factory Reset.

bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)

9 years agoam 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into...
Joe Fernandez [Mon, 1 Jun 2015 16:26:12 +0000 (16:26 +0000)]
am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
  docs: Android Dashboard - June 2015 update

9 years agoam 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:24:25 +0000 (16:24 +0000)]
am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

* commit '3aa33b3da04774d76e1a65b749667450dc81532b':
  Update button to BUTTON_STYLUS_PRIMARY

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

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

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

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

9 years agoresolved conflicts for merge of a61e23f1 to mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:23:14 +0000 (09:23 -0700)]
resolved conflicts for merge of a61e23f1 to mnc-dev

Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc

9 years agoMerge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:17:36 +0000 (16:17 +0000)]
Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

9 years agoMerge "Update stylus button press recognition in View to use new MotionEvent APIs...
Mady Mellor [Mon, 1 Jun 2015 16:16:16 +0000 (16:16 +0000)]
Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev

9 years agoMerge "Update stylus button press recognition in GestureDetector to use new APIs...
Mady Mellor [Mon, 1 Jun 2015 16:15:52 +0000 (16:15 +0000)]
Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev

9 years agoam 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:12:35 +0000 (16:12 +0000)]
am 8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev

* commit '8825de1751b4362d3a6fce2e402c51e481bb2729':
  Revert "Revert "Fix build.""

9 years agoam b3054109: am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to...
smain@google.com [Mon, 1 Jun 2015 16:12:32 +0000 (16:12 +0000)]
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 'b305410962eba135605c87ed246b2d7051d4e86a':
  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 agoMerge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:47 +0000 (16:07 +0000)]
Merge "Revert "Revert "Fix build.""" into mnc-dev

9 years agoRevert "Revert "Fix build.""
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:36 +0000 (16:07 +0000)]
Revert "Revert "Fix build.""

This reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.

Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e

9 years agoam 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview...
Joe Fernandez [Mon, 1 Jun 2015 16:06:26 +0000 (16:06 +0000)]
am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

* commit '9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
  docs: Android Dashboard - June 2015 update

9 years agoFix row/column order when unparcelling CollectionItemInfo
Alan Viverette [Mon, 1 Jun 2015 16:03:27 +0000 (09:03 -0700)]
Fix row/column order when unparcelling CollectionItemInfo

Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c

9 years agoam 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search...
smain@google.com [Mon, 1 Jun 2015 16:01:30 +0000 (16:01 +0000)]
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 '67725e2aa47596207ebffc00e3737c609536fe93':
  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 35a803be: Only use outsets for full screen windows.
Filip Gruszczynski [Mon, 1 Jun 2015 16:01:16 +0000 (16:01 +0000)]
am 35a803be: Only use outsets for full screen windows.

* commit '35a803beec9ce508fd53ab7e4111f2f9f87296c1':
  Only use outsets for full screen windows.

9 years agoMerge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
Joe Fernandez [Mon, 1 Jun 2015 15:52:31 +0000 (15:52 +0000)]
Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs

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

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

9 years agodocs: Android Dashboard - June 2015 update
Joe Fernandez [Mon, 1 Jun 2015 15:47:19 +0000 (08:47 -0700)]
docs: Android Dashboard - June 2015 update

Change-Id: I81709ea7f4d5ac0abfbd2834c98c4e05b4904878

9 years agoam 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistaken...
smain@google.com [Mon, 1 Jun 2015 15:42:57 +0000 (15:42 +0000)]
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 '7f6da0c3cbb9b38d345f7c575d1069d2a85099e5':
  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 agoMerge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into...
Filip Gruszczynski [Mon, 1 Jun 2015 15:42:40 +0000 (15:42 +0000)]
Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

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

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

9 years agoOnly use outsets for full screen windows.
Filip Gruszczynski [Wed, 27 May 2015 22:38:29 +0000 (15:38 -0700)]
Only use outsets for full screen windows.

Change-Id: I1d89c314b0f9944dfa417ce066c397073d51466e

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

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

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

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

9 years agoam 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
Selim Cinek [Mon, 1 Jun 2015 15:34:48 +0000 (15:34 +0000)]
am 4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev

* commit '4bd071e590ad5917ae81e71ad6b1d0807d8893cb':
  Shortened the duration of HUNs

9 years agoadd back the GMS and GCM reference lists to fix search suggest.
smain@google.com [Mon, 1 Jun 2015 15:21:07 +0000 (08:21 -0700)]
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

Change-Id: I804364d98d5dea6110bb309603c80df84c66a19d

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:19:48 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:19:18 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Battery saver: limit notification intents to system UI." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 15:04:25 +0000 (15:04 +0000)]
Merge "Battery saver: limit notification intents to system UI." into mnc-dev

9 years agoBattery saver: limit notification intents to system UI.
John Spurlock [Mon, 1 Jun 2015 14:56:42 +0000 (10:56 -0400)]
Battery saver: limit notification intents to system UI.

Ensure the actions taken by the HUN warnings came from sysui.

Bug: 20918350
Change-Id: I8dc02ebdfcc1f60d068bea43e10e350dc566728d

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 14:56:20 +0000 (07:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I486cfef976fec3c97a0f7a07dfdbb65b585e6554
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 14:51:58 +0000 (07:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: I04d01f1c65927634e8b27c3780e5e392fcdba28b
Auto-generated-cl: translation import

9 years agoMerge "Shortened the duration of HUNs" into mnc-dev
Selim Cinek [Mon, 1 Jun 2015 14:50:10 +0000 (14:50 +0000)]
Merge "Shortened the duration of HUNs" into mnc-dev

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

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

9 years agoMerge "Fix javadocs based on recent case consistency change" into mnc-dev
Neil Fuller [Mon, 1 Jun 2015 12:04:43 +0000 (12:04 +0000)]
Merge "Fix javadocs based on recent case consistency change" into mnc-dev

9 years agoFix javadocs based on recent case consistency change
Neil Fuller [Thu, 28 May 2015 17:19:02 +0000 (18:19 +0100)]
Fix javadocs based on recent case consistency change

Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
(cherry-picked from commit 0e1c0e11e41c85487349fcb719d2ab1d1823534e)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761

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

* commit 'ab06923576d4a49bc84c94badfcebcb7f6b103a8':
  Treat RTM_DELNEIGH as a transition to NUD_NONE

9 years agoTreat RTM_DELNEIGH as a transition to NUD_NONE
Erik Kline [Mon, 1 Jun 2015 03:44:01 +0000 (12:44 +0900)]
Treat RTM_DELNEIGH as a transition to NUD_NONE

RTM_DELNEIGHs can happen naturally during garbage collection of STALE
entries, as well as when an interface is going down.  All other
transitions of interest at this time pass through FAILED.

Bug: 18581716
Bug: 21531726
Change-Id: Ib2a731dd6ad6ece478df6950d4cc7752588328a4

9 years agoam 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:31:49 +0000 (03:31 +0000)]
am 29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '29932d13a90e02c3fce680e68de975a5d77ab9db':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:18:40 +0000 (03:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:03:18 +0000 (03:03 +0000)]
am d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:03:14 +0000 (03:03 +0000)]
am 7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '7c2bd4c2b4da1ac9acac4689043a6a5281607b70':
  Import translations. DO NOT MERGE

9 years agoam edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:03:10 +0000 (03:03 +0000)]
am edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:03:06 +0000 (03:03 +0000)]
am 09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '094956316ebb26b12198102c157fdb980bf646e3':
  Import translations. DO NOT MERGE

9 years agoam 5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:03:02 +0000 (03:03 +0000)]
am 5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam ec83bc71: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:02:57 +0000 (03:02 +0000)]
am ec83bc71: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:02:54 +0000 (03:02 +0000)]
am 3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '3b88e96aa904bf830bcfd46492e0daa1f8b36fd2':
  Import translations. DO NOT MERGE

9 years agoam 9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 03:02:50 +0000 (03:02 +0000)]
am 9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 03:01:28 +0000 (20:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib590e26c7e75ed6bbc29654fbe16a18e75089dbc
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:59:58 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:59:03 +0000 (02:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:58:20 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:58:03 +0000 (19:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic3da6671bd7a81f8a9c07a0a922d07b773377f96
Auto-generated-cl: translation import

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:57:51 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:57:21 +0000 (02:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:55:30 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:55:02 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sun, 31 May 2015 02:54:47 +0000 (02:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:46:03 +0000 (19:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iee1ea995ead91aaa2264414fcd73817ab94aa973
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:42:49 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie86b62bb9884b5043fada9b96feac9104b67a052
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:39:34 +0000 (19:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c36a192af260cddb4e659825037b5727a9c8fcd
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:36:14 +0000 (19:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I40a24917618ab5fb0c5ef063b6ccc6b845bf0ec9
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:32:52 +0000 (19:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2548176e1f01dd7955f765ce8ff6207fd92c9110
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:29:41 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaf2d35fbd552a97e238b3b4ba0b531a86d842e9f
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sun, 31 May 2015 02:26:25 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifde28ca81052a95d8216d8dbd119c07f99ae08e8
Auto-generated-cl: translation import

9 years agoam a35e790d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Sat, 30 May 2015 23:09:52 +0000 (23:09 +0000)]
am a35e790d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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