OSDN Git Service
Andrii Kulian [Tue, 3 Apr 2018 01:03:36 +0000 (18:03 -0700)]
Merge "Don't finish activity on duplicate resume request" into pi-dev am:
38af02e75b
am:
4f632a306f
Change-Id: I016967a65cbbce525088d3c008d5bb311dc69d83
Sudheer Shanka [Tue, 3 Apr 2018 01:00:12 +0000 (18:00 -0700)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev am:
8303baf4d0
am:
99b208a705
Change-Id: Iff6aacfe864d7a7548ab461ae704fafe2ba92fde
Todd Kennedy [Tue, 3 Apr 2018 00:04:14 +0000 (00:04 +0000)]
Merge "Use per user info for seinfo" into pi-dev am:
ce5f2b3e87
am:
82cac7ce69
Change-Id: Ic9420e057d739c56fa34381682239bd07be0f49c
Mike Digman [Mon, 2 Apr 2018 23:58:18 +0000 (23:58 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev am:
78e805684b
am:
5bbbbfd57c
Change-Id: I931a77d77780c7da0d3e01d0cc99312348943961
Pavel Maltsev [Mon, 2 Apr 2018 23:53:36 +0000 (23:53 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev am:
7f5670fdcd
am:
32a5f10b96
Change-Id: I2dc8ce54b94b33fc207546604b381089604243d1
Erik Kline [Mon, 2 Apr 2018 23:48:48 +0000 (23:48 +0000)]
Merge "Refactor isTetheringSupported() calls" am:
e34c426fd3 am:
6f63d051d6
am:
019cb1d42c
Change-Id: Ifa121b057f9959ddb980edc940327929e48ea973
Derek Sollenberger [Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)]
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am:
ffe1c2a266" into pi-dev-plus-aosp
am:
c13bf77769
Change-Id: I1d93eb9fadc99f578e7162a6aae82d6eb612a3b8
Remi NGUYEN VAN [Mon, 2 Apr 2018 23:06:53 +0000 (23:06 +0000)]
Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am:
07daad2dbf" into pi-dev-plus-aosp
am:
83b2d00f8d
Change-Id: I73dc0a154199b9856bf0d1d9dcc7e3c104fe6591
Andrii Kulian [Mon, 2 Apr 2018 22:58:26 +0000 (22:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
am:
38af02e75b
Change-Id: I8d7d56c9b6d7b1e987379ae26e883a8e1deb2ecf
Sudheer Shanka [Mon, 2 Apr 2018 22:53:08 +0000 (22:53 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
am:
8303baf4d0
Change-Id: Ia476818fee03347c5d0bf80d3197ef391b9f7c66
Chalard Jean [Mon, 2 Apr 2018 22:51:45 +0000 (22:51 +0000)]
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am:
6e66280d35" into pi-dev-plus-aosp
am:
35bca7f53b
Change-Id: I349260cae5d0d97f2f0962f62510703c5a94995c
Abodunrinwa Toki [Mon, 2 Apr 2018 22:20:45 +0000 (22:20 +0000)]
Merge "Merge "TextClassifier API updates." into pi-dev am:
bf9dfb16be" into pi-dev-plus-aosp
am:
008a5d01af
Change-Id: I4efb43ab74ac98244c6f4145855a75480e2c85b0
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 22:05:56 +0000 (22:05 +0000)]
[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am:
9bbfe5c14c am:
cc1bf181d0 -s ours
am:
e7c9223c56 -s ours
Change-Id: Iab0221299840cd3331afe23572d861ff857bab82
Todd Kennedy [Mon, 2 Apr 2018 21:59:09 +0000 (21:59 +0000)]
Merge "Use per user info for seinfo" into pi-dev
am:
ce5f2b3e87
Change-Id: I01dbd963e683fac472a58d6610fde40dc6fb79f2
Mike Digman [Mon, 2 Apr 2018 21:51:29 +0000 (21:51 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
am:
78e805684b
Change-Id: I2d038a72bd421832bd242b49e76eda9c16eb0285
Pavel Maltsev [Mon, 2 Apr 2018 21:47:22 +0000 (21:47 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
am:
7f5670fdcd
Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30
Bernie Innocenti [Mon, 2 Apr 2018 21:40:21 +0000 (21:40 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev am:
4a3ccc18e6
am:
37709fb20f
Change-Id: I1c2147fcec739994af65037c16428e0d82367b18
Remi NGUYEN VAN [Mon, 2 Apr 2018 21:34:54 +0000 (21:34 +0000)]
[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev am:
6f5a8db2e9 -s ours
am:
1a874296bb -s ours
Change-Id: I4e31562aff3f78c4c79f58f6970741e90ded4880
Remi NGUYEN VAN [Mon, 2 Apr 2018 21:30:40 +0000 (21:30 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev am:
dfa8f0dbce
am:
633d48d5a5
Change-Id: Icc710ee97c02e7f40eb2ed8c64cd314db3b978f1
Bill Yi [Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
e970444839 -s ours
am:
326344d20c -s ours
Change-Id: Iee048c4f7737bde065c2d42ef540e904bb614cb4
Bill Yi [Mon, 2 Apr 2018 21:26:18 +0000 (21:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
ae73c8bea6 -s ours
am:
316ecebd70 -s ours
Change-Id: I11aa3efcabcafb98a3142454bdb33a669bef25a1
Seigo Nonaka [Mon, 2 Apr 2018 21:21:59 +0000 (21:21 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev am:
138148425c
am:
f0a302f119
Change-Id: I30e9dfd37853001f77f655b74445d2861f05e12b
Bill Yi [Mon, 2 Apr 2018 21:16:11 +0000 (21:16 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
299491afe1 -s ours
am:
469a4ce1d2 -s ours
Change-Id: Idbe486c3bd6a2b60299b8a988124b73fd3d5dd6a
Bill Yi [Mon, 2 Apr 2018 21:15:45 +0000 (21:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
aaa2849890 -s ours
am:
2a3fcd8c9f -s ours
Change-Id: I2a14c3144042b5a90febd68b95c5c97e3dfde0e4
Bo Zhu [Mon, 2 Apr 2018 21:15:18 +0000 (21:15 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev am:
3cd574ced9
am:
4c7cc36000
Change-Id: I2ea971fcc97f88679ba8436b0e2bf4a2de08a856
Bill Yi [Mon, 2 Apr 2018 21:11:08 +0000 (21:11 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85e4a97789 -s ours
am:
73af74db6c -s ours
Change-Id: I44a8c5f57d3d00311441c3fff7bdeba5d9e04fcb
Bill Yi [Mon, 2 Apr 2018 21:10:33 +0000 (21:10 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
879127f31d -s ours
am:
edc08f4382 -s ours
Change-Id: Ibb74eb19844dfe8bc0348ee095202a2703cc3e28
Erik Kline [Mon, 2 Apr 2018 21:08:52 +0000 (21:08 +0000)]
Merge "Refactor isTetheringSupported() calls" am:
e34c426fd3
am:
6f63d051d6
Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d
Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Refactor isTetheringSupported() calls"
am:
e34c426fd3
Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822
Bill Yi [Mon, 2 Apr 2018 20:52:51 +0000 (20:52 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
f03441f47f -s ours
am:
b9de890ab5 -s ours
Change-Id: I3e0aac4393c3cf2715283d69ec9dfd1af5f4cac1
Daichi Hirono [Mon, 2 Apr 2018 20:52:23 +0000 (20:52 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev am:
c0f8eb345a
am:
e36dae9aa6
Change-Id: Ibb9e47b84e8b32f1ff9e169b485577c6fe9559ff
Bill Yi [Mon, 2 Apr 2018 20:48:09 +0000 (20:48 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
da6cff4e08 -s ours
am:
7c2c6f36e6 -s ours
Change-Id: I83105881a3b70bcb7c04c9cae1dd8aa4a001d055
Android Build Merger (Role) [Mon, 2 Apr 2018 20:40:45 +0000 (20:40 +0000)]
Merge "Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev am:
21306849e6 am:
1eec82353c"
Dianne Hackborn [Mon, 2 Apr 2018 20:39:22 +0000 (20:39 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev am:
21306849e6
am:
1eec82353c
Change-Id: Id62ee94ade97b55eb088a0ff8abf2ce0b994ef68
TreeHugger Robot [Mon, 2 Apr 2018 20:36:43 +0000 (20:36 +0000)]
Merge "Added decoding of truncated AAPT string lengths."
Mihai Popa [Mon, 2 Apr 2018 20:33:44 +0000 (20:33 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev am:
4ab18af48a
am:
e5e39b534b
Change-Id: I47394c618e10eb42ae6508f1593f8dc1c4078d90
Android Build Merger (Role) [Mon, 2 Apr 2018 20:27:43 +0000 (20:27 +0000)]
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am:
ffe1c2a266" into pi-dev-plus-aosp
Derek Sollenberger [Mon, 2 Apr 2018 20:26:38 +0000 (20:26 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
am:
ffe1c2a266
Change-Id: I4dc9a7272aeeda9ae6be5ce9215cc2a4939286fa
Android Build Merger (Role) [Mon, 2 Apr 2018 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am:
07daad2dbf" into pi-dev-plus-aosp
Remi NGUYEN VAN [Mon, 2 Apr 2018 20:19:22 +0000 (20:19 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev
am:
07daad2dbf
Change-Id: I8fc1a2c491f4518ee835a197a0f5f0cd7ba23543
Bo Zhu [Mon, 2 Apr 2018 20:19:17 +0000 (20:19 +0000)]
Merge "Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev am:
b152a8c45d" into pi-dev-plus-aosp
am:
bef26a2ada
Change-Id: Ic1ea494ddaf13bac2fd1a52c1c0961f012906d68
Android Build Merger (Role) [Mon, 2 Apr 2018 20:15:03 +0000 (20:15 +0000)]
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am:
6e66280d35" into pi-dev-plus-aosp
Chalard Jean [Mon, 2 Apr 2018 20:14:29 +0000 (20:14 +0000)]
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am:
6e66280d35
Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
Android Build Merger (Role) [Mon, 2 Apr 2018 20:10:17 +0000 (20:10 +0000)]
Merge "Merge "TextClassifier API updates." into pi-dev am:
bf9dfb16be" into pi-dev-plus-aosp
Dmitry Dementyev [Mon, 2 Apr 2018 20:07:29 +0000 (20:07 +0000)]
Merge "Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev am:
bf08774704" into pi-dev-plus-aosp
am:
0a55c385db
Change-Id: I23c58ffecb005b8fcb938d9a25afccdabdc7b09d
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 20:05:00 +0000 (20:05 +0000)]
[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am:
9bbfe5c14c
am:
cc1bf181d0 -s ours
Change-Id: Ica090f421ddbf4672f68bdbf77839a8e931638cf
Abodunrinwa Toki [Mon, 2 Apr 2018 20:03:04 +0000 (20:03 +0000)]
Merge "TextClassifier API updates." into pi-dev
am:
bf9dfb16be
Change-Id: I11d37c920abb4aa1fbd5022f30a10fdbe8efe997
Bo Zhu [Mon, 2 Apr 2018 19:56:48 +0000 (19:56 +0000)]
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am:
49eb4c1f1f" into pi-dev-plus-aosp
am:
4db0bb58ce
Change-Id: I559fdbc3e29c3281146317987447f2be5bd02d7d
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 19:54:57 +0000 (19:54 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
am:
9bbfe5c14c
Change-Id: Ida0d753a46f7aef9f0596d414edab8d36ea24b82
Bernie Innocenti [Mon, 2 Apr 2018 19:51:19 +0000 (19:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev
am:
4a3ccc18e6
Change-Id: I62c4c90283ab9a989db084e8d19582010f66bcee
TreeHugger Robot [Mon, 2 Apr 2018 19:47:39 +0000 (19:47 +0000)]
Merge "Add ROLLBACK past signing cert capability."
Lucas Dupin [Mon, 2 Apr 2018 19:45:46 +0000 (19:45 +0000)]
Merge "Merge "Slice row redlines and animations" into pi-dev am:
9009654c1d" into pi-dev-plus-aosp
am:
d7ab87a945
Change-Id: I9da562471a1f26f11231b73eff4d03ac77984934
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:43:54 +0000 (19:43 +0000)]
[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev
am:
6f5a8db2e9 -s ours
Change-Id: I4182b2dfad1f40dd29da8c3612cf0dbc4038aa7b
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev
am:
dfa8f0dbce
Change-Id: Ifb99a545b972b80ac5c0edf01e10b36e06ac06c5
Bill Yi [Mon, 2 Apr 2018 19:36:17 +0000 (19:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e970444839 -s ours
Change-Id: Ia07b2d0ddf15dc1600bcf890ccb36e6cf26e8060
Bill Yi [Mon, 2 Apr 2018 19:35:42 +0000 (19:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae73c8bea6 -s ours
Change-Id: I2af4ff532f7f72de181464ff43ec6dbc355896aa
Bill Yi [Mon, 2 Apr 2018 19:34:13 +0000 (19:34 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
07a75e0f9f -s ours" into pi-dev-plus-aosp
am:
90fc3e3592 -s ours
Change-Id: I2acc1bf899c0500c9a1a16fe073b76ad3dc8fe71
Jan Althaus [Mon, 2 Apr 2018 19:32:31 +0000 (19:32 +0000)]
Merge "Merge "Change Locate to Map for address selections" into pi-dev am:
03061a7903" into pi-dev-plus-aosp
am:
fbf46f6981
Change-Id: I1ea9a28699c775f29e0ae6c8b419bab46e337dea
Seigo Nonaka [Mon, 2 Apr 2018 19:31:33 +0000 (19:31 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev
am:
138148425c
Change-Id: I25a8114a246c7c0a244e2ee69f9efd58b5dbd6f9
Bill Yi [Mon, 2 Apr 2018 19:27:00 +0000 (19:27 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
299491afe1 -s ours
Change-Id: I08cce5c324d11d7cdbd9935a83593edada6d57c3
Bill Yi [Mon, 2 Apr 2018 19:26:22 +0000 (19:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aaa2849890 -s ours
Change-Id: I6fbc173e9e9007dfd471b14edf806ba882f4e16a
Bo Zhu [Mon, 2 Apr 2018 19:25:47 +0000 (19:25 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev
am:
3cd574ced9
Change-Id: I01e101f36dba43b062bb3134ed171e1eff358d24
Bill Yi [Mon, 2 Apr 2018 19:21:53 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85e4a97789 -s ours
Change-Id: I97dd7864f151d03d6fa048720a039b81f84145a2
Bill Yi [Mon, 2 Apr 2018 19:21:22 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
879127f31d -s ours
Change-Id: Idf4d54fcb3cab7feb32a9061978f5d5b4e671609
Bill Yi [Mon, 2 Apr 2018 19:21:03 +0000 (19:21 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
38dccc3fff -s ours" into pi-dev-plus-aosp
am:
d471070afc -s ours
Change-Id: I002d1ecbc201135b2cab6336c78433a6e101149a
Bill Yi [Mon, 2 Apr 2018 19:20:54 +0000 (19:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f03441f47f -s ours
Change-Id: I0397dce3962f676f180b499853faf64a8dabcb51
Daichi Hirono [Mon, 2 Apr 2018 19:20:24 +0000 (19:20 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev
am:
c0f8eb345a
Change-Id: Icc3778801aad786bc9cd2ee01be93c70b9158c82
Ryan Mitchell [Thu, 29 Mar 2018 22:49:10 +0000 (15:49 -0700)]
Added decoding of truncated AAPT string lengths.
AAPT incorrectly writes a truncated string length when the string size
exceeded the maximum possible encode length value (0x7FFF). To decode a
truncated length, this change iterates through length values that end
in the encode length bits. Strings that exceed the maximum encode length
are not placed into StringPools in AAPT2.
Test: Successfully ran broken apps from the duplicates of the bugs
provided and created tests
Bug:
69320870
Change-Id: I99dd9b63e91ac250f81d5dfc26b7c0e6276ae162
Bill Yi [Mon, 2 Apr 2018 19:15:44 +0000 (19:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
da6cff4e08 -s ours
Change-Id: I45d54de12a471a850a63e520899e6265d9a413a4
Bill Yi [Mon, 2 Apr 2018 19:12:14 +0000 (19:12 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
46b20b4e18 -s ours" into pi-dev-plus-aosp
am:
28ce9be592 -s ours
Change-Id: Ib85a83cb94373dea6740254159cc775f386aa6fe
Dianne Hackborn [Mon, 2 Apr 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev
am:
21306849e6
Change-Id: Ia999a20e8f0959876f9cb05d121982cc2c1f0890
Ryan Mitchell [Mon, 2 Apr 2018 19:07:24 +0000 (19:07 +0000)]
Merge "Fixed resource bag retrieval infinite recursion."
Mihai Popa [Mon, 2 Apr 2018 19:01:09 +0000 (19:01 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev
am:
4ab18af48a
Change-Id: I01333effc684267875cec696fab175b01304ef43
Bernie Innocenti [Mon, 2 Apr 2018 18:51:02 +0000 (18:51 +0000)]
Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8 am:
f0ddd72f0f" into pi-dev-plus-aosp
am:
7276ad54fc
Change-Id: Ibc546739cbbcaba635967bb95b91bb5b0a4068e2
Treehugger Robot [Mon, 2 Apr 2018 18:47:18 +0000 (18:47 +0000)]
Merge "Refactor isTetheringSupported() calls"
Android Build Merger (Role) [Mon, 2 Apr 2018 18:46:40 +0000 (18:46 +0000)]
Merge "Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev am:
b152a8c45d" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:46:18 +0000 (18:46 +0000)]
Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev
am:
b152a8c45d
Change-Id: Ic23e7b2e675ac0f4b2b6e306a5b8605eab4a330c
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 18:43:01 +0000 (18:43 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
Android Build Merger (Role) [Mon, 2 Apr 2018 18:41:53 +0000 (18:41 +0000)]
Merge "Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev am:
bf08774704" into pi-dev-plus-aosp
Dmitry Dementyev [Mon, 2 Apr 2018 18:41:30 +0000 (18:41 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev
am:
bf08774704
Change-Id: Iee0b88661e5bbe67f6dcb7aa2027d0e5b123eef3
Bill Yi [Mon, 2 Apr 2018 18:37:53 +0000 (18:37 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
292a890081 -s ours
am:
6e5e0f5887 -s ours
Change-Id: Ia35a68f4252ff525586f25b4ea8432ff8cec8b70
Android Build Merger (Role) [Mon, 2 Apr 2018 18:37:32 +0000 (18:37 +0000)]
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am:
49eb4c1f1f" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:37:04 +0000 (18:37 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev
am:
49eb4c1f1f
Change-Id: I929c1ce5c10359a188ba2354697eda5cb8c17b08
Bill Yi [Mon, 2 Apr 2018 18:35:49 +0000 (18:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
5080670104 -s ours
am:
13762aaa63 -s ours
Change-Id: I91e6fc7f632f51c1e4812a7baf3668e8ed8b52ba
Bill Yi [Mon, 2 Apr 2018 18:34:14 +0000 (18:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
89af056de6 -s ours
am:
defc0f3ddf -s ours
Change-Id: I97e2e51a12704374f1f16624bdb7dfe22c99f3a8
Android Build Merger (Role) [Mon, 2 Apr 2018 18:33:07 +0000 (18:33 +0000)]
Merge "Merge "Slice row redlines and animations" into pi-dev am:
9009654c1d" into pi-dev-plus-aosp
Lucas Dupin [Mon, 2 Apr 2018 18:32:37 +0000 (18:32 +0000)]
Merge "Slice row redlines and animations" into pi-dev
am:
9009654c1d
Change-Id: Id420d3c839a440d395212e30c26c67a7b79488fa
Bill Yi [Mon, 2 Apr 2018 18:32:20 +0000 (18:32 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
86fdaf1a6b -s ours
am:
7a7f15609b -s ours
Change-Id: I1ee7e4adacb4066fee4ff501f5f6cefe497c24da
Bill Yi [Mon, 2 Apr 2018 18:30:30 +0000 (18:30 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
2b7c92eb4c -s ours
am:
1876333dc3 -s ours
Change-Id: I97bcd643747c1b42587935f9a63aa6b755717e0d
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:41 +0000 (18:28 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
07a75e0f9f -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
07a75e0f9f -s ours
Change-Id: I29c5bed425329d789b1bef6efb147e6bcbd4ad7b
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:07 +0000 (18:28 +0000)]
Merge "Merge "Change Locate to Map for address selections" into pi-dev am:
03061a7903" into pi-dev-plus-aosp
Jan Althaus [Mon, 2 Apr 2018 18:27:44 +0000 (18:27 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev
am:
03061a7903
Change-Id: I9ce3068cc2c8b09a73b6ac1f1a9b5585c767f316
Bill Yi [Mon, 2 Apr 2018 18:26:56 +0000 (18:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
7f32755459 -s ours
am:
ca13839616 -s ours
Change-Id: Icf4052937c598068851e19b8ac09c3eda5bee96f
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:56 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
38dccc3fff -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
38dccc3fff -s ours
Change-Id: I9239d12a182a41dcb5db4a33f2b8fdac5aef5763
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:28 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
46b20b4e18 -s ours" into pi-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:18 +0000 (18:23 +0000)]
Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8 am:
f0ddd72f0f" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
46b20b4e18 -s ours
Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15
Bernie Innocenti [Mon, 2 Apr 2018 18:22:47 +0000 (18:22 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8
am:
f0ddd72f0f
Change-Id: I2827fc9159fe8d372d881451b9971ddcc4a0530f
OSDN Git Service
