OSDN Git Service
Hansong Zhang [Thu, 21 Dec 2017 22:41:34 +0000 (22:41 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3 am:
d6c2722094
am:
f3caa4dc5a -s ours
Change-Id: I0e57ed1b1d48339ce841eb9bd193ded71e48e053
TreeHugger Robot [Thu, 21 Dec 2017 22:36:44 +0000 (22:36 +0000)]
Merge "Always synchronize the OemUnlockAllowed bit to the FRP partition"
Hansong Zhang [Thu, 21 Dec 2017 22:31:53 +0000 (22:31 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3
am:
d6c2722094
Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
Hansong Zhang [Thu, 21 Dec 2017 22:08:20 +0000 (22:08 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
am:
045fdae1b3
Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
TreeHugger Robot [Thu, 21 Dec 2017 22:07:15 +0000 (22:07 +0000)]
Merge "Workaround apps that are doing very very bad things"
Oscar Shu [Thu, 21 Dec 2017 22:05:44 +0000 (22:05 +0000)]
Merge "WifiManager API documentation update"
TreeHugger Robot [Thu, 21 Dec 2017 22:00:31 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:38:00 +0000 (21:38 +0000)]
Merge "Add asn1 to platform." am:
bdd0da8fa7 am:
ea1d85d484
am:
a44b3e3d12 -s ours
Change-Id: I7ae27f189174885f2e7c528c87a04aefc925c47a
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Add asn1 to platform." am:
bdd0da8fa7
am:
ea1d85d484
Change-Id: Ib2968038bcacdc81e2249dc5e3a40f25ceb191b7
Bill Yi [Thu, 21 Dec 2017 21:22:14 +0000 (21:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c0745b94c2 -s ours
am:
f49bf087ba -s ours
Change-Id: Id61b4a2da9551c8c084d7b5e71333105cbdfb225
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:19:28 +0000 (21:19 +0000)]
Merge "Add asn1 to platform."
am:
bdd0da8fa7
Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
Bill Yi [Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c0745b94c2 -s ours
Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639
TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."
Tyler Gunn [Thu, 21 Dec 2017 20:43:39 +0000 (20:43 +0000)]
Merge "Add logging and disconnect reason for null connections." am:
7661e81f85 am:
c840efcf7e
am:
5d7c823e16
Change-Id: I57395d052d284ca3b8071b71dc762c1147d1107a
Bill Yi [Thu, 21 Dec 2017 20:39:18 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours am:
f0687d1201 -s ours am:
9c166446fd -s ours
am:
a1834cfc3f -s ours
Change-Id: Ia65be7aaf7fdf86151eb0ace6e2cb3400a0b73c2
Bill Yi [Thu, 21 Dec 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours am:
1f9ae3b912 -s ours am:
66acdceb9b -s ours
am:
97ae42b0d6 -s ours
Change-Id: Iab46453d06f635518df8ada21c74afb82f6e4a65
Bill Yi [Thu, 21 Dec 2017 20:36:24 +0000 (20:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours am:
b7a560fb10 -s ours am:
5af20c1c28 -s ours
am:
1598332a7f -s ours
Change-Id: Id3efdeb1929c635d8536125776d17ea2bdb72690
Bill Yi [Thu, 21 Dec 2017 20:34:39 +0000 (20:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours am:
f24783846d -s ours
am:
29f70cb6fb -s ours
Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
Bill Yi [Thu, 21 Dec 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours am:
59f4b0c11f -s ours
am:
6ba039da20 -s ours
Change-Id: I6d3cfb032e8402a6458b83213739fbf11ee78f0d
Bill Yi [Thu, 21 Dec 2017 20:31:52 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours am:
37e0c23902 -s ours
am:
b4db20359a -s ours
Change-Id: I543fbce177f9dc7cbc2448f08e00780e801aff2d
Bill Yi [Thu, 21 Dec 2017 20:30:35 +0000 (20:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours am:
95b4c706b8 -s ours
am:
5dd6a1c735 -s ours
Change-Id: I9c7854ba3ff5cac3da1e39e7fe48ba0b27a06e4a
Bill Yi [Thu, 21 Dec 2017 20:28:58 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours am:
a963a02442 -s ours
am:
dfa5f5d102 -s ours
Change-Id: I14296ee29df5b968168c0e9815f96cb88972bd0a
Bill Yi [Thu, 21 Dec 2017 20:27:51 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours am:
5f38be9fdb -s ours
am:
6868ade468 -s ours
Change-Id: I91ee1333af3dfb29d70d5929a228c91edd9ce10d
Bill Yi [Thu, 21 Dec 2017 20:26:17 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours am:
50f7d64f05 -s ours
am:
833ba96cba -s ours
Change-Id: I38b2c9a6f75f6d38ca4e79dc204b2603de633ce1
Android Build Merger (Role) [Thu, 21 Dec 2017 20:10:29 +0000 (20:10 +0000)]
Merge "Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f am:
ca88d359c0"
abdalkader [Thu, 21 Dec 2017 20:10:03 +0000 (20:10 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f
am:
ca88d359c0
Change-Id: Iea7624e10230294505982f0373b97a2486d6996f
Tyler Gunn [Thu, 21 Dec 2017 20:06:18 +0000 (20:06 +0000)]
Merge "Add logging and disconnect reason for null connections." am:
7661e81f85
am:
c840efcf7e
Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8
Android Build Merger (Role) [Thu, 21 Dec 2017 20:06:07 +0000 (20:06 +0000)]
Merge "Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738 am:
a33e1dd26f -s ours"
Yan Sun [Thu, 21 Dec 2017 20:05:39 +0000 (20:05 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738
am:
a33e1dd26f -s ours
Change-Id: I98caf6c319a21ebd5f85c1c740691ddcd31894ba
Android Build Merger (Role) [Thu, 21 Dec 2017 20:01:19 +0000 (20:01 +0000)]
Merge "Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d am:
cb9ded1d30 -s ours"
Chrison.chai [Thu, 21 Dec 2017 20:00:54 +0000 (20:00 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d
am:
cb9ded1d30 -s ours
Change-Id: I879999d0033e242d02c50bf6ea4a2c40a433a871
Tyler Gunn [Thu, 21 Dec 2017 20:00:28 +0000 (20:00 +0000)]
Merge "Add logging and disconnect reason for null connections."
am:
7661e81f85
Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
Android Build Merger (Role) [Thu, 21 Dec 2017 19:59:57 +0000 (19:59 +0000)]
Merge "Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425 am:
0a6f66e9a9 -s ours"
Bill Yi [Thu, 21 Dec 2017 19:59:54 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours am:
f0687d1201 -s ours
am:
9c166446fd -s ours
Change-Id: Ide4d30d971d02840f7f70733e15e5083ecbca5ea
Philip P. Moltmann [Thu, 21 Dec 2017 19:59:29 +0000 (19:59 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425
am:
0a6f66e9a9 -s ours
Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333
Bill Yi [Thu, 21 Dec 2017 19:58:39 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours am:
1f9ae3b912 -s ours
am:
66acdceb9b -s ours
Change-Id: I64312d2118512439ba4c4c7746d2c3550a525295
Bill Yi [Thu, 21 Dec 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours am:
b7a560fb10 -s ours
am:
5af20c1c28 -s ours
Change-Id: I8d98d9728d058add17b64172221733bedb07b4f3
Android Build Merger (Role) [Thu, 21 Dec 2017 19:54:55 +0000 (19:54 +0000)]
Merge "Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a am:
c65e740f98 -s ours"
Bill Yi [Thu, 21 Dec 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours
am:
f24783846d -s ours
Change-Id: I47bd5497b0ac5ef061975b4ef7aed22cb016d2db
Sanket Padawe [Thu, 21 Dec 2017 19:54:03 +0000 (19:54 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a
am:
c65e740f98 -s ours
Change-Id: I457622e41c15891142a51140b083d1d6b465e10e
Siddharth Ray [Thu, 21 Dec 2017 19:53:54 +0000 (19:53 +0000)]
Merge "Obtain cellular related battery statistics"
Bill Yi [Thu, 21 Dec 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours
am:
59f4b0c11f -s ours
Change-Id: I6c0cbf7c26fc7f2b010126e5aa7ceb444aa71ab3
Bill Yi [Thu, 21 Dec 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours
am:
37e0c23902 -s ours
Change-Id: I2e96d32fcbb128a84828172f17b45db12ee790fd
Bill Yi [Thu, 21 Dec 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours
am:
95b4c706b8 -s ours
Change-Id: Ia66e2c284c14aa911c92f49150ce9b8ee6c345e8
Chenbo Feng [Thu, 21 Dec 2017 19:49:25 +0000 (19:49 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1 am:
fa7f4015fc
am:
09a81e4da1
Change-Id: I90ce68a72afbf596e28d987e925795709d24dd52
Bill Yi [Thu, 21 Dec 2017 19:47:45 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours
am:
a963a02442 -s ours
Change-Id: Ife6d85d42f5f0beffdaf5da0c031e79d74d3c8d9
Bill Yi [Thu, 21 Dec 2017 19:46:22 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours
am:
5f38be9fdb -s ours
Change-Id: I835ba14d3bed4c5ebf901d60a2603c6692135b4e
TreeHugger Robot [Thu, 21 Dec 2017 19:44:38 +0000 (19:44 +0000)]
Merge "Move ServiceListing to SettingsLib and add tests"
Bill Yi [Thu, 21 Dec 2017 19:44:05 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours
am:
50f7d64f05 -s ours
Change-Id: Ie2458ad57d6b64678243429e257e0701edd357a5
abdalkader [Thu, 21 Dec 2017 19:40:25 +0000 (19:40 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63
am:
f9eba1a18f
Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
Tyler Gunn [Thu, 21 Dec 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Add logging and disconnect reason for null connections."
Wei Wang [Wed, 20 Dec 2017 23:56:46 +0000 (15:56 -0800)]
Always synchronize the OemUnlockAllowed bit to the FRP partition
ag/
3023334 tried to synchronize the OemUnlockAllowed bit to the FRP
partition when deice is being unlocked.
However it missed a case when device was unlocked before ag/
3023334
landed.
This CL will sync synchronize the OemUnlockAllowed bit on
isOemUnlockAllowed(), and it avoids redundant write by checking if
the bit is already synced.
Bug:
67043266
Bug:
68245782
Test: do factory reset on a device unlocked before ag/
3023334 and FRP is
not enforced
Change-Id: If209757cfbb202e180a5b2c1b5259af6d00aa599
Yan Sun [Thu, 21 Dec 2017 19:36:32 +0000 (19:36 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0
am:
dee5f9a738
Change-Id: Ib7aa75882fb1b8d3c3380ec680969abe252cbff1
Chrison.chai [Thu, 21 Dec 2017 19:32:18 +0000 (19:32 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours
am:
e9940be86d
Change-Id: I77051a94b2e8694d378973c79310befca933515b
Bill Yi [Thu, 21 Dec 2017 19:28:46 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours
am:
f0687d1201 -s ours
Change-Id: Ia6678879fac5025f54f6d40b8dbc8ef7a1b9832d
Philip P. Moltmann [Thu, 21 Dec 2017 19:28:17 +0000 (19:28 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0
am:
b42cd23425
Change-Id: I7d7096cf24234925256895c3527f44e72cf07493
Bill Yi [Thu, 21 Dec 2017 19:26:54 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours
am:
1f9ae3b912 -s ours
Change-Id: I74c034b1c5247fb0ce7ace539014f9052092413e
Bill Yi [Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours
am:
b7a560fb10 -s ours
Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4
TreeHugger Robot [Thu, 21 Dec 2017 19:23:41 +0000 (19:23 +0000)]
Merge "Add TestApi to disable the TextClock clock tick."
Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours
am:
f6c335b353 -s ours
Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4
Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours
am:
39d480e67c -s ours
Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2
abdalkader [Thu, 21 Dec 2017 19:20:36 +0000 (19:20 +0000)]
Merge "SMS over IMS APIs revision"
am:
2bf7f03e63
Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
Sanket Padawe [Thu, 21 Dec 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06
am:
151c15445a
Change-Id: Ie5c522cd1c9c3b0da254cf1fa9f1a756361a4e3f
Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours
am:
934729c535 -s ours
Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2
Yan Sun [Thu, 21 Dec 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Add Notification Flag behavior test"
am:
89bb1971d0
Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours
am:
f123f221db -s ours
Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704
Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours
am:
7baaa51e62 -s ours
Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2
Chenbo Feng [Thu, 21 Dec 2017 19:15:29 +0000 (19:15 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1
am:
fa7f4015fc
Change-Id: I14f614a86214bd4f006415c48b9a8323e06c737f
Chrison.chai [Thu, 21 Dec 2017 19:14:40 +0000 (19:14 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
am:
d8514e82aa -s ours
Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
TreeHugger Robot [Thu, 21 Dec 2017 19:14:37 +0000 (19:14 +0000)]
Merge "Using new usbhost function usb_device_get_string_ucs2() to get USB descriptor strings."
Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours
am:
301dfae698 -s ours
Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150
Philip P. Moltmann [Thu, 21 Dec 2017 19:12:57 +0000 (19:12 +0000)]
Merge "Testables lib should not statically link mockito"
am:
47d04fc5c0
Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours
am:
25d7b576ec -s ours
Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec
Etan Cohen [Thu, 21 Dec 2017 18:47:46 +0000 (18:47 +0000)]
Merge "[AWARE] Check dynamic location permission"
Robert Berry [Thu, 21 Dec 2017 18:42:37 +0000 (18:42 +0000)]
Merge "Add userId to RecoverableKeyStoreDb"
Holly Jiuyu Sun [Mon, 11 Dec 2017 21:28:03 +0000 (13:28 -0800)]
Add asn1 to platform.
Add unit test.
Bug:
38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489
Ivan Lozano [Thu, 21 Dec 2017 18:29:00 +0000 (18:29 +0000)]
Merge "Fix doFadingAnimationLocked in sanitized builds."
Jiuyu Sun [Thu, 21 Dec 2017 18:28:36 +0000 (18:28 +0000)]
Merge "Add asn1 to platform."
Bill Yi [Thu, 21 Dec 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours
am:
7cb6513f6d -s ours
Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958
Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours
am:
0a1948e515 -s ours
Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
45d962274f -s ours
Change-Id: I43d3d8e14417f7aed30a470191386753c9957701
TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 18:01:15 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours
am:
b6dab6b3ee -s ours
Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66
Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours
am:
ea2e302eff -s ours
Change-Id: I9d23c6267a38545927029782293ef8a15961cca7
Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours
am:
f1c75d66ec -s ours
Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e
Andrew Solovay [Thu, 21 Dec 2017 17:56:48 +0000 (17:56 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev am:
7835c650b2
am:
7ad3eb8db0 -s ours
Change-Id: Ib0b4de07702d6a7337e47f72fe1b5d31039a5454
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours
am:
bd14c44fd8 -s ours
Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"
Bill Yi [Thu, 21 Dec 2017 17:53:27 +0000 (17:53 +0000)]
Import translations. DO NOT MERGE am:
406659b709 -s ours am:
1fccf167ff -s ours am:
daa1d87e50 -s ours am:
0e62ea2f4c -s ours am:
c5dff435b0 -s ours
am:
16a7391b2a -s ours
Change-Id: I5a1fa1ae1bd8cf10fe404fc43f0e5e3357d48af1
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours
am:
c344f9b1c7 -s ours
Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours
am:
d21211470c -s ours
Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours
am:
2c97ca3b62 -s ours
Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Tony Mantler [Wed, 20 Dec 2017 23:53:33 +0000 (15:53 -0800)]
Move ServiceListing to SettingsLib and add tests
Bug:
70902607
Test: RunSettingsLibRoboTests
Change-Id: I172092f8c249e76667136442080d5fd7a6a6ef01
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
81b98ffb09 -s ours
Change-Id: I6369ce728c37d066932736566e465f73e7843eb5
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
599fb37c01 -s ours
Change-Id: Icc605bca96905c647601df651186850c874b5442