OSDN Git Service
Bill Yi [Thu, 17 May 2018 23:20:16 +0000 (16:20 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev
am:
5667f966e5
Change-Id: Iba9987a2228227107c2870f2a57b4c132e3f6e3e
Bill Yi [Thu, 17 May 2018 23:18:59 +0000 (16:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
am:
a72fe6a957 -s ours
Change-Id: I659644d1abcb04788c35591a290440e8a990e79c
Bill Yi [Thu, 17 May 2018 23:15:13 +0000 (16:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3
am:
19bf5aa466 -s ours
Change-Id: I99a15ef8e43c65f65d99c83c27d8779bbf03f864
TreeHugger Robot [Thu, 17 May 2018 23:08:40 +0000 (23:08 +0000)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e
Import translations. DO NOT MERGE
Android Build Merger (Role) [Thu, 17 May 2018 20:16:51 +0000 (20:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa
Change-Id: If1028ada1c941503fb6019248df34e3746fcde2f
Android Build Merger (Role) [Thu, 17 May 2018 20:16:44 +0000 (20:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e
Change-Id: I1f62a7df5e9abe4a14bb1f8dd746518935ad3799
Bill Yi [Thu, 17 May 2018 20:16:22 +0000 (13:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccdcf6f4eb7734618d1ac104ba2605c2b8eaed78
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 17 May 2018 17:57:50 +0000 (17:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3
Change-Id: I56ff76335c44571f3df4c63f95970b97555cd9b4
Android Build Merger (Role) [Thu, 17 May 2018 17:57:40 +0000 (17:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc
Change-Id: I7b718beb5044ad046eed73fc54950f724ee70a78
Bill Yi [Thu, 17 May 2018 17:57:03 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6a4271d7a7e37cf847a3f8e920b9937885564fa
Auto-generated-cl: translation import
Tony Mak [Thu, 10 May 2018 20:28:09 +0000 (13:28 -0700)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3 am:
2cb239cf3c am:
8914d11b15 am:
675ad12059
am:
ed2d7b7d62
Change-Id: Ibfff2e78a363925207bd6ea0364aa494f99fe6b3
Eugene Susla [Thu, 10 May 2018 20:07:48 +0000 (13:07 -0700)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18 am:
232f42c7b8 am:
76a04ff670 am:
2bd91daa06
am:
3543522564
Change-Id: I62fb1c7d3eb618e7f3d8b2033303761c5f75e9c8
Android Build Merger (Role) [Thu, 10 May 2018 17:41:07 +0000 (17:41 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3 am:
2cb239cf3c am:
8914d11b15 am:
675ad12059
Change-Id: I9435814e67948c466a6bebc7acdcb2e68b30d4be
Android Build Merger (Role) [Thu, 10 May 2018 17:41:03 +0000 (17:41 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3 am:
2cb239cf3c am:
8914d11b15
Change-Id: I72861a0685af1981b9a50ebbb8eb315d150f5f63
Android Build Merger (Role) [Thu, 10 May 2018 17:40:57 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3 am:
2cb239cf3c
Change-Id: I8f405684aae1cdb6aac377861d3387622a20f661
Android Build Merger (Role) [Thu, 10 May 2018 17:40:52 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8 am:
fb67a0f5f3
Change-Id: I756b595747e3d97ddb14dc45ed1b6001ec6ebed8
Android Build Merger (Role) [Thu, 10 May 2018 17:40:46 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3 am:
42ded39df8
Change-Id: I315da9ccb85d9e69edf18dd85b7bdf183bd6f738
Android Build Merger (Role) [Thu, 10 May 2018 17:40:32 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360 am:
6a42ea18b3
Change-Id: If82fd8b2c76bedf089bec4501169417427854b1d
Android Build Merger (Role) [Thu, 10 May 2018 17:40:27 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510 am:
884d2c7360
Change-Id: I0e5ba8adaed2d6247137319262278fac98f467e1
Android Build Merger (Role) [Thu, 10 May 2018 17:40:22 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373 am:
b1f2848510
Change-Id: I689d44b6617f0ed949e3f72367980158ea06ad0d
Android Build Merger (Role) [Thu, 10 May 2018 17:40:16 +0000 (17:40 +0000)]
[automerger] clearCallingIdentity before calling into getPackageUidAsUser am:
857326e373
Change-Id: I2166c2f9ca0a6654e1a88b1d183062eb1564c24d
Tony Mak [Thu, 14 Dec 2017 12:40:07 +0000 (12:40 +0000)]
clearCallingIdentity before calling into getPackageUidAsUser
Fix:
70585244
Bug:
69981755
Test: Enable any accessibility service -> inflate work profile
-> Tap on any work app -> no longer crash
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile
Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d
Android Build Merger (Role) [Wed, 9 May 2018 17:20:01 +0000 (17:20 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18 am:
232f42c7b8 am:
76a04ff670 am:
2bd91daa06
Change-Id: I88ccfc06e5639ce48c5e8a4659d2cbb7c47b5825
Android Build Merger (Role) [Wed, 9 May 2018 17:19:53 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18 am:
232f42c7b8 am:
76a04ff670
Change-Id: Id013258bbcfb2664c03df15a082bc04ea053663e
Android Build Merger (Role) [Wed, 9 May 2018 17:19:45 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18 am:
232f42c7b8
Change-Id: I42da7843ef9ecdbc1411a25feb95701150664490
Android Build Merger (Role) [Wed, 9 May 2018 17:19:38 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2 am:
97f7498c18
Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f
Android Build Merger (Role) [Wed, 9 May 2018 17:19:32 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960 am:
9e291fe8c2
Change-Id: Ia6ba75b4938ab6d9ec0ffe1bc39b6ce6995a808e
Android Build Merger (Role) [Wed, 9 May 2018 17:19:18 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f am:
6b95503960
Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b
Android Build Merger (Role) [Wed, 9 May 2018 17:19:12 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a am:
a99414f51f
Change-Id: I7aaceff0646a5e738ed862c34645e548aabf62f1
Android Build Merger (Role) [Wed, 9 May 2018 17:19:07 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288 am:
743abb939a
Change-Id: Ia89ea1adb47be3b70f5db292677c4c19194a04db
Android Build Merger (Role) [Wed, 9 May 2018 17:19:02 +0000 (17:19 +0000)]
[automerger] Nullcheck to fix Autofill CTS am:
6c68a69288
Change-Id: I379d54d926e01da53b637bba6b3b1ee8577cbdbb
Eugene Susla [Mon, 11 Dec 2017 18:07:03 +0000 (10:07 -0800)]
Nullcheck to fix Autofill CTS
Test: presubmit
Fixes:
70506475
Bug:
69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
Ecco Park [Fri, 4 May 2018 20:34:34 +0000 (13:34 -0700)]
Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev
am:
a13c8187c8
Change-Id: I5ffcd6ba62f2c085f2a9929fadd0366238c9183a
Ecco Park [Fri, 4 May 2018 20:21:53 +0000 (20:21 +0000)]
Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev
Ecco Park [Thu, 3 May 2018 21:49:40 +0000 (14:49 -0700)]
Osu: fixed Mismatch between createFromParcel and writeToParcel
Bug:
77600924
Change-Id: I46d765892e8e6839ed5140a3b0d6bb1815ccf9bc
Signed-off-by: Ecco Park <eccopark@google.com>
android-build-team Robot [Fri, 4 May 2018 00:58:59 +0000 (17:58 -0700)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
am:
8d16d7915d
Change-Id: Ib34226b3ce41e83ae018c86d5a4e53564e207b46
android-build-team Robot [Fri, 4 May 2018 00:47:48 +0000 (00:47 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
android-build-team Robot [Thu, 3 May 2018 23:31:58 +0000 (16:31 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
am:
96e62bb999
Change-Id: I387591c99f211f3e2399eed316cc1eada3a6b7f5
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into nyc-dev
android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0 skipped:
4eaa691175
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Thu, 3 May 2018 22:56:49 +0000 (15:56 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev
am:
a9e5b5dce0
Change-Id: Id8fb16f96cd87b7aeb8cf501a70952e877ac0210
android-build-team Robot [Thu, 3 May 2018 22:36:11 +0000 (22:36 +0000)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1 skipped:
2005cc7070
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
android-build-team Robot [Mon, 30 Apr 2018 22:29:19 +0000 (15:29 -0700)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
am:
0a7c41615e
Change-Id: I259380ed027d31c4b8292f366590f0757f540766
android-build-team Robot [Mon, 30 Apr 2018 22:17:01 +0000 (22:17 +0000)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev
Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
Merged-In: I7f2201cab36adf7f01d1a794d783cb78a536811f
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:09 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0 skipped:
4eaa691175
Change-Id: I6b6efc3f1188408a00519655b85b0f711bd64a3e
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:08 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1 skipped:
2005cc7070
Change-Id: I1f1bde1d068339077f793eb1c66dc66dc73465b3
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:03 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184 am:
2b41ff76b0
Change-Id: I6e5bf8c2f05f44bc292f4c0ec1fcc885a4a24655
Android Build Merger (Role) [Thu, 26 Apr 2018 21:19:02 +0000 (21:19 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c am:
d72de1bde1
Change-Id: Ie77705fa3dbe32da614f664393624829bc82c3ea
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:58 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81 am:
9822117184
Change-Id: I8e628fee8dd1b9c488aca0ce8f3508c109dd9e18
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:57 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87 am:
f145e8172c
Change-Id: I92b07540faa277e95bd832196589d42e8e405eda
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:53 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1 am:
b906043c81
Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:51 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda am:
cdc99a0e87
Change-Id: I1aa2ecc6c3d344a5889edc10401515178620d42b
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:47 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
b6cde9ecc1
Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153
Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:45 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844 am:
1839e70cda
Change-Id: I264e7ffed376146303f48c01b57fad6d2fe8e19a
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:32 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f skipped:
365fb1c844
Change-Id: I2d42a069fb0b4bae27b8e29e1182e2935c604835
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:27 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e am:
0cd0cef08f
Change-Id: I937e2d9a676b38f6a18cda70f42d06eaa22ce051
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:21 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c am:
8fbe4bce1e
Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6
Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:14 +0000 (21:18 +0000)]
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am:
984dfe074c
Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c
Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2
sqian [Sat, 14 Apr 2018 00:10:05 +0000 (17:10 -0700)]
Fix broken check for TelephonyManager#getForbiddenPlmns
(backport from a fix merged in pi-dev)
Bug:
73884967
Test: Treehugger
Change-Id: I9deaae20893184cde36dcd936fe83708fa60b830
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
Merged-In: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
Bill Yi [Mon, 16 Apr 2018 19:01:52 +0000 (12:01 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
am:
231719b4d2
Change-Id: I5186692869d8849e0abc8d60f97970ce07e273aa
Bill Yi [Mon, 16 Apr 2018 19:00:03 +0000 (12:00 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
am:
fde5e09eeb -s ours
Change-Id: Ife2f1cabaad48b2b89dfe46c6de4f1cfa18c27cc
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
am:
bfcb8b99a5 -s ours
Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
am:
cb80417eab -s ours
Change-Id: I29e67171958497655f4d0374b2decbc1429135f7
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
am:
67841fe1e6 -s ours
Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Import translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 18:43:55 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Mon, 16 Apr 2018 18:43:24 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054
Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am:
ba2da34cdf
Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e
Bill Yi [Mon, 16 Apr 2018 18:39:49 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425
Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d
Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881
Bill Yi [Mon, 16 Apr 2018 18:33:52 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288
Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b
Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]
[automerger] Import translations. DO NOT MERGE am:
c7fe3a5972
Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46
Android Build Merger (Role) [Mon, 16 Apr 2018 17:38:05 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553
Change-Id: Ia7cd12b4e564df81716a199c23e0566a7d263e32
Bill Yi [Mon, 16 Apr 2018 00:03:09 +0000 (17:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
am:
d12aff917a -s ours
Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c
TreeHugger Robot [Sun, 15 Apr 2018 23:54:46 +0000 (23:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Philip P. Moltmann [Sun, 15 Apr 2018 00:26:51 +0000 (17:26 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am:
6173fbe12e
Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea
Philip P. Moltmann [Sun, 15 Apr 2018 00:14:53 +0000 (17:14 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805
am:
877a845005
Change-Id: Ifd815fa2dcabe164a7445654ac9f2374c7a7db9e
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am:
cda08919cf
Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:14 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28
Change-Id: I07cc5ff54cd477b8ea8ff6a448f7bd3622a9eb8d
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:09 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2
Change-Id: Iaceae5c38f84ffe2ec85ea9b7219da86a857487c
Bill Yi [Sat, 14 Apr 2018 23:04:25 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81ee67e251052ffde639e2cef623bce67b81d4f2
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 14 Apr 2018 22:07:15 +0000 (22:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8
Change-Id: Id2549c7e1686f34666745e21392e1a7260887d69
Bill Yi [Sat, 14 Apr 2018 22:06:42 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I325626393f7c9aaa848bec773997db66ad99cfbb
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:59:57 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idbd724355ebbab64d4f4a8948607c0fd5e492ef1
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:35:24 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I959e7781b8d82fcce095a81698f1f4a9a0fddbc4
Auto-generated-cl: translation import
Bill Yi [Sat, 14 Apr 2018 21:00:11 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d954e7efdb153eb01f0d8f68d483a6e1e5af0f8
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627 am:
419b357806
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE (N) Revoke permision when group changed am:
5aee569627
DO NOT MERGE (N) Revoke permision when group changed
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge "DO NOT MERGE (N) Revoke permision when group changed" into nyc-dev
OSDN Git Service
