OSDN Git Service

android-x86/frameworks-base.git
9 years agoam "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev autome...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:30 +0000 (13:43 -0700)]
am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212"

merged from goog/mirror-m-wireless-internal-release
6c70b49 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev automerge: 2f23212

9 years agoam "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:29 +0000 (13:43 -0700)]
am "Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev"

merged from goog/mirror-m-wireless-internal-release
2f23212 Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev

9 years agoam "IMS: Support for IMS Registration error codes"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:28 +0000 (13:43 -0700)]
am "IMS: Support for IMS Registration error codes"

merged from goog/mirror-m-wireless-internal-release
b54d218 IMS: Support for IMS Registration error codes

9 years agoam "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:27 +0000 (13:43 -0700)]
am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d"

merged from goog/mirror-m-wireless-internal-release
e4112b7 am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs automerge: df5651d

9 years agoam "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:26 +0000 (13:43 -0700)]
am "am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
df5651d am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs

9 years agoam "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge:...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:25 +0000 (13:43 -0700)]
am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913"

merged from goog/mirror-m-wireless-internal-release
2f4f522 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos automerge: 32ee913

9 years agoam "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:24 +0000 (13:43 -0700)]
am "am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos"

merged from goog/mirror-m-wireless-internal-release
32ee913 am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos

9 years agoam "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:23 +0000 (13:43 -0700)]
am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816"

merged from goog/mirror-m-wireless-internal-release
2a23382 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev automerge: 701d816

9 years agoam "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:21 +0000 (13:43 -0700)]
am "am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
701d816 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev

9 years agoam "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:20 +0000 (13:43 -0700)]
am "Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
ddbf13d Merge "Hide calllog entries for unregistered phone accounts" into m-wireless-dev

9 years agoam "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and...
Vinit Deshpande [Sun, 15 Mar 2015 20:43:19 +0000 (13:43 -0700)]
am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3"

merged from goog/mirror-m-wireless-internal-release
5bd0d33 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs automerge: ac35ad3

9 years agoam "Hide calllog entries for unregistered phone accounts"
Vinit Deshpande [Sun, 15 Mar 2015 20:43:11 +0000 (13:43 -0700)]
am "Hide calllog entries for unregistered phone accounts"

merged from goog/mirror-m-wireless-internal-release
2d2bc16 Hide calllog entries for unregistered phone accounts

Change-Id: I39b60b86fca9c1b74d750ab251cc26b3ce5f5650

9 years agoam "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:51 +0000 (13:42 -0700)]
am "am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
ac35ad3 am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs

9 years agoam "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:50 +0000 (13:42 -0700)]
am "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af"

merged from goog/mirror-m-wireless-internal-release
9674014 am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix automerge: 06a22af

9 years agoam "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:49 +0000 (13:42 -0700)]
am "am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix"

merged from goog/mirror-m-wireless-internal-release
06a22af am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix

9 years agoam "Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:48 +0000 (13:42 -0700)]
am "Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
1c55b90 Merge "Enable Ethernet if the device has FEATURE_USB_HOST." into m-wireless-dev

9 years agoam "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:47 +0000 (13:42 -0700)]
am "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge: ee314cf"

merged from goog/mirror-m-wireless-internal-release
bb33ce8 am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs automerge: ee314cf

9 years agoam "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:46 +0000 (13:42 -0700)]
am "am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
ee314cf am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

9 years agoam "Enable Ethernet if the device has FEATURE_USB_HOST."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:44 +0000 (13:42 -0700)]
am "Enable Ethernet if the device has FEATURE_USB_HOST."

merged from goog/mirror-m-wireless-internal-release
f4f93b2 Enable Ethernet if the device has FEATURE_USB_HOST.

9 years agoam "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:43 +0000 (13:42 -0700)]
am "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs automerge: 5890742"

merged from goog/mirror-m-wireless-internal-release
6657dd3 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs automerge: 5890742

9 years agoam "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:42 +0000 (13:42 -0700)]
am "am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
5890742 am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs

9 years agoam "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:41 +0000 (13:42 -0700)]
am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9"

merged from goog/mirror-m-wireless-internal-release
7ddec30 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev automerge: 3797ee9

9 years agoam "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:40 +0000 (13:42 -0700)]
am "am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
3797ee9 am 4eedcceb: Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev

9 years agoam "add 2 side RTT support on scan"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:38 +0000 (13:42 -0700)]
am "add 2 side RTT support on scan"

merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan

9 years agoam "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:37 +0000 (13:42 -0700)]
am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e"

merged from goog/mirror-m-wireless-internal-release
73cb967 am c974ac11: MediaProjectionPermissionActivity: Fix NPE. automerge: d3c532e

9 years agoam "am c974ac11: MediaProjectionPermissionActivity: Fix NPE."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:36 +0000 (13:42 -0700)]
am "am c974ac11: MediaProjectionPermissionActivity: Fix NPE."

merged from goog/mirror-m-wireless-internal-release
d3c532e am c974ac11: MediaProjectionPermissionActivity: Fix NPE.

9 years agoam "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:35 +0000 (13:42 -0700)]
am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc"

merged from goog/mirror-m-wireless-internal-release
2782f31 am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs automerge: 9a447bc

9 years agoam "am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:34 +0000 (13:42 -0700)]
am "am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08"

merged from goog/mirror-m-wireless-internal-release
2444690 am a81ed3cd: docs: support library updates for sdk 22 automerge: 7a3dc08

9 years agoam "am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:33 +0000 (13:42 -0700)]
am "am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b"

merged from goog/mirror-m-wireless-internal-release
c3b5768 am e0ce0f2c: docs: platform revisions 5.1 automerge: 7de9d3b

9 years agoam "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:32 +0000 (13:42 -0700)]
am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9"

merged from goog/mirror-m-wireless-internal-release
63751cf am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev automerge: a5587b9

9 years agoam "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:31 +0000 (13:42 -0700)]
am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca"

merged from goog/mirror-m-wireless-internal-release
91572ab am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev automerge: 0a1d5ca

9 years agoam "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:30 +0000 (13:42 -0700)]
am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14"

merged from goog/mirror-m-wireless-internal-release
0764a8b am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs automerge: b068c14

9 years agoam "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:29 +0000 (13:42 -0700)]
am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257"

merged from goog/mirror-m-wireless-internal-release
6e3276c am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev automerge: 287f257

9 years agoam "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:28 +0000 (13:42 -0700)]
am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011"

merged from goog/mirror-m-wireless-internal-release
46d48f9 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev automerge: 622c011

9 years agoam "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:27 +0000 (13:42 -0700)]
am "am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
9a447bc am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

9 years agoam "am a81ed3cd: docs: support library updates for sdk 22"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:25 +0000 (13:42 -0700)]
am "am a81ed3cd: docs: support library updates for sdk 22"

merged from goog/mirror-m-wireless-internal-release
7a3dc08 am a81ed3cd: docs: support library updates for sdk 22

9 years agoam "am e0ce0f2c: docs: platform revisions 5.1"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:24 +0000 (13:42 -0700)]
am "am e0ce0f2c: docs: platform revisions 5.1"

merged from goog/mirror-m-wireless-internal-release
7de9d3b am e0ce0f2c: docs: platform revisions 5.1

9 years agoam "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:23 +0000 (13:42 -0700)]
am "am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
a5587b9 am 54643332: Merge "Doc change: Add diff report for API 22." into lmp-mr1-dev

9 years agoam "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:22 +0000 (13:42 -0700)]
am "am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
0a1d5ca am 2ba57444: Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev

9 years agoam "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:21 +0000 (13:42 -0700)]
am "am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
b068c14 am 3f3f842c: am d54fe112: am 2cbda290: am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs

9 years agoam "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:20 +0000 (13:42 -0700)]
am "am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
287f257 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev

9 years agoam "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:19 +0000 (13:42 -0700)]
am "am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
622c011 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev

9 years agoam "Correct "Sign-in" and "Sign into" to "Sign in to"."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:17 +0000 (13:42 -0700)]
am "Correct "Sign-in" and "Sign into" to "Sign in to"."

merged from goog/mirror-m-wireless-internal-release
44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".

9 years agoam "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:16 +0000 (13:42 -0700)]
am "Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
46bdfa9 Merge "Refactor NetworkUtils interaction with DHCP." into m-wireless-dev

9 years agoam "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:15 +0000 (13:42 -0700)]
am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d"

merged from goog/mirror-m-wireless-internal-release
335b59f am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d

9 years agoam "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:42:14 +0000 (13:42 -0700)]
am "am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
4322c8d am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

9 years agoam "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:13 +0000 (13:42 -0700)]
am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07"

merged from goog/mirror-m-wireless-internal-release
969b027 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev automerge: 2b24d07

9 years agoam "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:12 +0000 (13:42 -0700)]
am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29"

merged from goog/mirror-m-wireless-internal-release
e99bef0 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev automerge: 5e84b29

9 years agoam "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList...
Vinit Deshpande [Sun, 15 Mar 2015 20:42:11 +0000 (13:42 -0700)]
am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793"

merged from goog/mirror-m-wireless-internal-release
b2c8848 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab02793

9 years agoam "Update API."
Vinit Deshpande [Sun, 15 Mar 2015 20:42:02 +0000 (13:42 -0700)]
am "Update API."

merged from goog/mirror-m-wireless-internal-release
3ec7681 Update API.

Change-Id: Id4a08ee8e55cd4f5e8182a38d4855be80d452090

9 years agoam "Add frameworks classes and methods necessary for VVM syncadapter structure."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:31 +0000 (13:41 -0700)]
am "Add frameworks classes and methods necessary for VVM syncadapter structure."

merged from goog/mirror-m-wireless-internal-release
7c07dfa Add frameworks classes and methods necessary for VVM syncadapter structure.

9 years agoam "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:25 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

merged from goog/mirror-m-wireless-internal-release
204f80e Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I363403bf73b202f03b3f706a823b0f142183a695

9 years agoam "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""
Vinit Deshpande [Sun, 15 Mar 2015 20:41:14 +0000 (13:41 -0700)]
am "Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB.""

merged from goog/mirror-m-wireless-internal-release
da35a2b Revert "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

Change-Id: I4dc4865d58e4b68858c7767f201e267a72dc236b

9 years agoam "Add PHONE_ACCOUNT_ADDRESS to the call log DB."
Vinit Deshpande [Sun, 15 Mar 2015 20:41:04 +0000 (13:41 -0700)]
am "Add PHONE_ACCOUNT_ADDRESS to the call log DB."

merged from goog/mirror-m-wireless-internal-release
40c6f2b Add PHONE_ACCOUNT_ADDRESS to the call log DB.

Change-Id: I91b487137a2da621b496bf5f135fe19bb0a6ca62

9 years agoam "Changed package name of a Telecom service"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:57 +0000 (13:40 -0700)]
am "Changed package name of a Telecom service"

merged from goog/mirror-m-wireless-internal-release
c4959ab Changed package name of a Telecom service

9 years agoam "Small update to PhoneAccountHandle ID javadoc."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:55 +0000 (13:40 -0700)]
am "Small update to PhoneAccountHandle ID javadoc."

merged from goog/mirror-m-wireless-internal-release
b7bb8c4 Small update to PhoneAccountHandle ID javadoc.

9 years agoam "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:54 +0000 (13:40 -0700)]
am "Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
4eddc11 Merge "Add multi-SIM fields to VoicemailContract.Status." into m-wireless-dev

9 years agoam "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:53 +0000 (13:40 -0700)]
am "Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
e28ad78 Merge "Add Sub-ID-from-phone-account converter method." into m-wireless-dev

9 years agoam "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:52 +0000 (13:40 -0700)]
am "Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
bf443f9 Merge "Unhide and rename PhoneNumberUtils tts methods" into m-wireless-dev

9 years agoam "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:51 +0000 (13:40 -0700)]
am "Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev"

merged from goog/mirror-m-wireless-internal-release
24ab1e4 Merge "Unhide telecom APIs needed by Contacts" into m-wireless-dev

9 years agoam "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:50 +0000 (13:40 -0700)]
am "am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
2b24d07 am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

9 years agoam "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:49 +0000 (13:40 -0700)]
am "am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
5e84b29 am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev

9 years agoam "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:48 +0000 (13:40 -0700)]
am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
ab02793 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

9 years agoam "am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:47 +0000 (13:40 -0700)]
am "am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
c92fa1f am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

9 years agoam "Add multi-SIM fields to VoicemailContract.Status."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:45 +0000 (13:40 -0700)]
am "Add multi-SIM fields to VoicemailContract.Status."

merged from goog/mirror-m-wireless-internal-release
109dabd Add multi-SIM fields to VoicemailContract.Status.

9 years agoam "Add Sub-ID-from-phone-account converter method."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:43 +0000 (13:40 -0700)]
am "Add Sub-ID-from-phone-account converter method."

merged from goog/mirror-m-wireless-internal-release
9b09c15 Add Sub-ID-from-phone-account converter method.

9 years agoam "am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:42 +0000 (13:40 -0700)]
am "am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update"

merged from goog/mirror-m-wireless-internal-release
d186768 am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update

9 years agoam "Unhide and rename PhoneNumberUtils tts methods"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:36 +0000 (13:40 -0700)]
am "Unhide and rename PhoneNumberUtils tts methods"

merged from goog/mirror-m-wireless-internal-release
57f8f0d Unhide and rename PhoneNumberUtils tts methods

Change-Id: I72ddd3c38b69a7354564e5d1a1ae2d20330f6f2b

9 years agoam "Unhide telecom APIs needed by Contacts"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:28 +0000 (13:40 -0700)]
am "Unhide telecom APIs needed by Contacts"

merged from goog/mirror-m-wireless-internal-release
48d8442 Unhide telecom APIs needed by Contacts

9 years agoam "Refactor NetworkUtils interaction with DHCP."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:27 +0000 (13:40 -0700)]
am "Refactor NetworkUtils interaction with DHCP."

merged from goog/mirror-m-wireless-internal-release
3c3ce17 Refactor NetworkUtils interaction with DHCP.

9 years agoam "am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:26 +0000 (13:40 -0700)]
am "am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
500a98a am 37f207e1: am 191131d4: am 50e8b020: am a83f6445: Merge "docs: gradle plugin version update" into lmp-docs

9 years agoam "am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:24 +0000 (13:40 -0700)]
am "am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
9036eeb am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs

9 years agoam "am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:23 +0000 (13:40 -0700)]
am "am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
8f7c837 am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs

9 years agoam "am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:22 +0000 (13:40 -0700)]
am "am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal"

merged from goog/mirror-m-wireless-internal-release
db10642 am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal

9 years agoam "Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:21 +0000 (13:40 -0700)]
am "Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev"

merged from goog/mirror-m-wireless-internal-release
73b0048 Merge "Separate NAT from forwarding." into lmp-mr1-wfc-dev

9 years agoam "Separate NAT from forwarding."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:20 +0000 (13:40 -0700)]
am "Separate NAT from forwarding."

merged from goog/mirror-m-wireless-internal-release
35e36db Separate NAT from forwarding.

9 years agoam "Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:40:19 +0000 (13:40 -0700)]
am "Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev"

merged from goog/mirror-m-wireless-internal-release
42ad7b5 Merge "Append forwarder name to ipfwd command" into lmp-mr1-wfc-dev

9 years agoam "am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:17 +0000 (13:40 -0700)]
am "am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
8b76495 am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

9 years agoam "am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:16 +0000 (13:40 -0700)]
am "am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
2db6e09 am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev

9 years agoam "am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool...
Vinit Deshpande [Sun, 15 Mar 2015 20:40:15 +0000 (13:40 -0700)]
am "am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
8472a74 am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs

9 years agoam "Telephony: Implementation for IWLAN."
Vinit Deshpande [Sun, 15 Mar 2015 20:40:04 +0000 (13:40 -0700)]
am "Telephony: Implementation for IWLAN."

merged from goog/mirror-m-wireless-internal-release
bece926 Telephony: Implementation for IWLAN.

Change-Id: I4d55b3452428ebf9fbcfc3ba3a75cefcb2aeb0cf

9 years agoam "am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:44 +0000 (13:39 -0700)]
am "am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
3882afb am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs

9 years agoam "am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:43 +0000 (13:39 -0700)]
am "am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
8451fef am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs

9 years agoam "Merge "Do not provide 5GHz option for softap if there is no country code availabl...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:42 +0000 (13:39 -0700)]
am "Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev"

merged from goog/mirror-m-wireless-internal-release
a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev

9 years agoam "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:41 +0000 (13:39 -0700)]
am "Merge "Passpoint API - Take 1" into m-wireless-wifi-dev"

merged from goog/mirror-m-wireless-internal-release
c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev

9 years agoam "am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:40 +0000 (13:39 -0700)]
am "am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
04d3e55 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev

9 years agoam "am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:39 +0000 (13:39 -0700)]
am "am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
e084c48 am 8ffb574a: am f7224396: am c427b721: am 41418826: Merge "docs: Android for Work developer landing page" into lmp-docs

9 years agoam "am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:38 +0000 (13:39 -0700)]
am "am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller"

merged from goog/mirror-m-wireless-internal-release
504d8c7 am 7391b0a1: am e64301e6: am 790b1bc8: am d3cd0948: docs: New doc for creating an AfW Work Policy Controller

9 years agoam "am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementin...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:37 +0000 (13:39 -0700)]
am "am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
da34160 am 93df7f07: am 032e931a: am 6ffe1058: am a2ae6c9d: Merge "docs: New "implementing app restrictions" doc" into lmp-docs

9 years agoam "am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:36 +0000 (13:39 -0700)]
am "am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection"

merged from goog/mirror-m-wireless-internal-release
92e587b am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection

9 years agoam "Passpoint API - Take 1"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:33 +0000 (13:39 -0700)]
am "Passpoint API - Take 1"

merged from goog/mirror-m-wireless-internal-release
b21d248 Passpoint API - Take 1

9 years agoam "Append forwarder name to ipfwd command"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:32 +0000 (13:39 -0700)]
am "Append forwarder name to ipfwd command"

merged from goog/mirror-m-wireless-internal-release
f3d4a58 Append forwarder name to ipfwd command

9 years agoam "Do not provide 5GHz option for softap if there is no country code available"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:30 +0000 (13:39 -0700)]
am "Do not provide 5GHz option for softap if there is no country code available"

merged from goog/mirror-m-wireless-internal-release
b938c0e Do not provide 5GHz option for softap if there is no country code available

9 years agoam "am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:29 +0000 (13:39 -0700)]
am "am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev"

merged from goog/mirror-m-wireless-internal-release
538987d am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

9 years agoam "am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:28 +0000 (13:39 -0700)]
am "am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
c586697 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

9 years agoam "am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:26 +0000 (13:39 -0700)]
am "am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
85fbd27 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

9 years agoam "am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:25 +0000 (13:39 -0700)]
am "am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
552313c am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

9 years agoam "Introduce onLost event on bssid hotlist [DO NOT MERGE]"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:24 +0000 (13:39 -0700)]
am "Introduce onLost event on bssid hotlist [DO NOT MERGE]"

merged from goog/mirror-m-wireless-internal-release with -s ours
No changes were actually committed

9 years agoam "am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with...
Vinit Deshpande [Sun, 15 Mar 2015 20:39:23 +0000 (13:39 -0700)]
am "am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs"

merged from goog/mirror-m-wireless-internal-release
7dca346 am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

9 years agoam "am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev"
Vinit Deshpande [Sun, 15 Mar 2015 20:39:22 +0000 (13:39 -0700)]
am "am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
3280f3d am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev