OSDN Git Service
Bill Yi [Fri, 18 May 2018 00:10:29 +0000 (17:10 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc
am:
5897727afc
Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9
Bill Yi [Fri, 18 May 2018 00:05:08 +0000 (17:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours
am:
60682c726c -s ours
Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f
Bill Yi [Thu, 17 May 2018 23:57:51 +0000 (16:57 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev am:
9ede115c2b
am:
43539011e4
Change-Id: I64ee4058dd334bd0be975016361fa97c905a598d
Bill Yi [Thu, 17 May 2018 23:52:04 +0000 (16:52 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d am:
81a6ef98f3 -s ours
am:
4fb03f2730 -s ours
Change-Id: I0eddfd0423b803df34e4134c294bb58bf165f688
Bill Yi [Thu, 17 May 2018 23:45:06 +0000 (16:45 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev am:
c6c611293d
am:
b2f28267ad
Change-Id: If282600586310eb4dc03523f4883ff15ac2db651
Bill Yi [Thu, 17 May 2018 23:39:55 +0000 (16:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0 am:
fb795ed727 -s ours
am:
c31d960f5e -s ours
Change-Id: I43fdbbc880a880f61b86a1f9e569f8c65196d65b
Bill Yi [Thu, 17 May 2018 23:36:39 +0000 (16:36 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
am:
ea5a5f49cc
Change-Id: Ib4683b9918a30e45b255e03b5dc5b38567b0bbe9
Bill Yi [Thu, 17 May 2018 23:35:10 +0000 (16:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
am:
4bfac58817 -s ours
Change-Id: I910a028d8a4945d0dbbd6334b1d95fc85dd162a1
Bill Yi [Thu, 17 May 2018 23:34:41 +0000 (16:34 -0700)]
Merge changes from topic "am-
93ef86f6-d908-4917-b503-
5ba7fcefcad8" into oc-dev am:
5667f966e5
am:
e2790f5d0f
Change-Id: Ifa350e4e880263f58b6eb5ade4fdee5427fcb08b
Bill Yi [Thu, 17 May 2018 23:31:32 +0000 (16:31 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
am:
9ede115c2b
Change-Id: Ida64b0840ce3569aa8a3ca5bb82a08de30ba3a23
Bill Yi [Thu, 17 May 2018 23:30:03 +0000 (16:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fc4347f98e skipped:
8b2ac4fffa am:
a72fe6a957 -s ours
am:
dc9639ab7f -s ours
Change-Id: Ib6ede43f9ed266ca41dffc03cc26422471b2afe2
Bill Yi [Thu, 17 May 2018 23:29:55 +0000 (16:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
am:
81a6ef98f3 -s ours
Change-Id: I653ae63bef34f046ac9fc9be7d0e04d818dd0d89
Bill Yi [Thu, 17 May 2018 23:26:51 +0000 (16:26 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev
am:
c6c611293d
Change-Id: I74ee0d6e477345487b6056b3e1f92a41ba67731f
Bill Yi [Thu, 17 May 2018 23:25:01 +0000 (16:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
am:
fb795ed727 -s ours
Change-Id: Id3bd937bf2aecd644b6c5ec4de4d8707196267f5
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:19:50 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a52a0f49cc skipped:
a5619cc4e3 am:
19bf5aa466 -s ours
am:
22961acba1 -s ours
Change-Id: I945ab1ecad9290ba64bad8b93fe7614b9a9778ae
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
TreeHugger Robot [Thu, 17 May 2018 23:17:28 +0000 (23:17 +0000)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 17 May 2018 23:16:59 +0000 (23:16 +0000)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862
Import translations. DO NOT MERGE
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:11:49 +0000 (23:11 +0000)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2
Import translations. DO NOT MERGE
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 19:15:58 +0000 (19:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d
Change-Id: I5c0b5c4beead842ea771083b8bb3a87d846b949f
Android Build Merger (Role) [Thu, 17 May 2018 19:15:52 +0000 (19:15 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862
Change-Id: Id48d35e7d3e303142ce734b6fe8d120bc7a63900
Bill Yi [Thu, 17 May 2018 19:15:29 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cd1fe0903685b95ef950bb675755fa3f9c0c61f
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 17 May 2018 19:03:57 +0000 (19:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f
Change-Id: I0ed0c7b8695b336bfea20432f5795a15ba8afc63
Android Build Merger (Role) [Thu, 17 May 2018 19:03:51 +0000 (19:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d
Change-Id: I0bc12ca3b01898ae0bd149dedd037105af6ba09f
Bill Yi [Thu, 17 May 2018 19:03:25 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I774c309761ed8d810d3eb5c7de2a6128e1b4e9c4
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 17 May 2018 18:44:45 +0000 (18:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2 skipped:
20306f6ce0
Change-Id: I21ab563abd9c30724436723f6dfd5a3c5debba5f
Android Build Merger (Role) [Thu, 17 May 2018 18:44:38 +0000 (18:44 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
379dacd8c2
Change-Id: I3e8c7aca201fda9fcaaba88e196b49af85a50c9a
Bill Yi [Thu, 17 May 2018 18:44:11 +0000 (11:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84a155dad80243362cd12cf62074aaebfe4df759
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:39:43 +0000 (13:39 -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
am:
e4204fa020
Change-Id: I4c1426d98c470490c9a62ca88bafbd5d5c62c09c
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:20:16 +0000 (13:20 -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
am:
775b8adf7b
Change-Id: I835e777e7e6bee5e91bfa729d095f8b6f0653c43
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:46:09 +0000 (13:46 -0700)]
Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev am:
a13c8187c8
am:
8720a5e1b7
Change-Id: I9f7936aeb38e472acbb1246ff160a4ec20aba419
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 01:06:40 +0000 (18:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am:
8d16d7915d
am:
eaa6d200b3 -s ours
Change-Id: Icb1b568faee09aa2113c1d832974f37d21ee96b0
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 [Fri, 4 May 2018 00:28:20 +0000 (00:28 +0000)]
Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-mr1-dev
android-build-team Robot [Thu, 3 May 2018 23:43:46 +0000 (16:43 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9-nyc-dev" into oc-dev am:
96e62bb999
am:
d9a2898a88
Change-Id: I2d4e8373092b33af5cc41287073842b8637b9e9e
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 23:10:17 +0000 (16:10 -0700)]
Merge changes from topic "am-
01dfab30-af7a-4b8d-97d8-
55bde12588f9" into oc-dev am:
a9e5b5dce0
am:
7e01400018
Change-Id: I863476787647ddcb16e5e0587d0c06a755cb0e07
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
Adrian Roos [Wed, 2 May 2018 12:30:35 +0000 (12:30 +0000)]
Fix build more
Bug:
78122614
Test: m checkbuild
Change-Id: Ia69eca72a2982c6417bcd30bf806ef8c18616251
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Adrian Roos [Mon, 23 Apr 2018 16:54:37 +0000 (18:54 +0200)]
Fix build
Bug:
78122614
Test: m checkbuild
Change-Id: Ifd908fc91dc89d33a2b88fcfaed48480315991c6
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
Adrian Roos [Tue, 20 Mar 2018 13:58:29 +0000 (14:58 +0100)]
OC-MR1 DisplayCutout XML API
Bug:
78122614
Test: m checkbuild
Change-Id: I974d3d4385ba66477e0932d40d0af7bcd32ddfb1
Merged-In: I226622533a1b406ba26c161cba13721080b4baca
android-build-team Robot [Mon, 30 Apr 2018 22:39:15 +0000 (15:39 -0700)]
Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am:
0a7c41615e
am:
4e0dd1197a
Change-Id: I4b37bce88249278a8b829b90adf679366e417428
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:22:39 +0000 (14:22 -0700)]
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Test: manual
Bug:
73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
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
OSDN Git Service
