OSDN Git Service
Bill Yi [Thu, 20 Jul 2017 10:08:45 +0000 (10:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
6564d7d123 -s ours
am:
dfd75c536f -s ours
Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1
Bill Yi [Thu, 20 Jul 2017 09:59:39 +0000 (09:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
6564d7d123 -s ours
Change-Id: I9e082bc72af2033aa0fcb3d565f77cba619f090c
TreeHugger Robot [Thu, 20 Jul 2017 09:48:53 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 08:45:26 +0000 (08:45 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
72a19b6d0b" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 20 Jul 2017 08:45:06 +0000 (08:45 +0000)]
Merge "Don't move stack to bottom when creating task at bottom am:
8cee0336bb am:
89dba67748" into oc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 20 Jul 2017 08:44:12 +0000 (08:44 +0000)]
Don't move stack to bottom when creating task at bottom am:
8cee0336bb
am:
72a19b6d0b
Change-Id: Id40abea748286f59273ea85a3925b9875e6801fa
Wale Ogunwale [Thu, 20 Jul 2017 08:43:43 +0000 (08:43 +0000)]
Don't move stack to bottom when creating task at bottom am:
8cee0336bb
am:
89dba67748
Change-Id: Iaf223c4444e70b0fc6d9a50e1e774c602163a12c
Di Lu [Thu, 20 Jul 2017 08:42:27 +0000 (08:42 +0000)]
Merge "Add unit test for IpSecService" am:
9e3f886dca am:
3182454f28 am:
345db82674
am:
636033782b
Change-Id: I788e4e8466a76f80d1f15330e6d3b91b73be1d32
Di Lu [Thu, 20 Jul 2017 08:38:36 +0000 (08:38 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c am:
73b7292a05 am:
eb7bc05b32
am:
aadf75714a
Change-Id: Iecf36183010f78920ef4112b9b0a0febf4ece82c
Wale Ogunwale [Thu, 20 Jul 2017 08:38:13 +0000 (08:38 +0000)]
Don't move stack to bottom when creating task at bottom
am:
8cee0336bb
Change-Id: I81914112fe2be1c3c69298d4cc5e9db302df618d
Andreas Gampe [Thu, 20 Jul 2017 08:36:57 +0000 (08:36 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6 am:
6078facf1f am:
57ba0ddc91
am:
d3e7126645 -s ours
Change-Id: I92025790fe2d6d9db9f57f51c31d5ddc5c022034
Wale Ogunwale [Thu, 20 Jul 2017 08:00:41 +0000 (08:00 +0000)]
Don't move stack to bottom when creating task at bottom
am:
8cee0336bb
Change-Id: Ic55fc2d7f7ef6b58ae8bd708e8e84b97744e30e3
Di Lu [Thu, 20 Jul 2017 07:50:21 +0000 (07:50 +0000)]
Merge "Add unit test for IpSecService" am:
9e3f886dca am:
3182454f28
am:
345db82674
Change-Id: Ia4d85bcf5c42774d7b48cb1cd648754b6dd16b69
Wale Ogunwale [Tue, 18 Jul 2017 13:33:01 +0000 (06:33 -0700)]
Don't move stack to bottom when creating task at bottom
When creating a task, only move the parents of the task if we are creating
the task at the top of the stack. i.e. creating the task at the top of its
stack will move the stack forward and creating the task at the bottom of
the stack shouldn't move the stack backwards. Creating a task at the bottom
is used for things like restoring a task from recents to use for other things
and for background user, so shouldn't affect visibility of its parent stack.
Change-Id: Ifcaf7c5a95294631dff675ac5c7d87f059b1792a
Fixes:
62352722
Test: go/wm-smoke
(cherry picked from commit
1f5b92fd53ad0193235ae3e6cbc54a4120ac2457)
Di Lu [Thu, 20 Jul 2017 07:43:12 +0000 (07:43 +0000)]
Merge "Add unit test for IpSecService" am:
9e3f886dca
am:
3182454f28
Change-Id: Iee7cc50b7f4715d9c6797356be5cac705407d4bc
Di Lu [Thu, 20 Jul 2017 07:36:19 +0000 (07:36 +0000)]
Merge "Add unit test for IpSecService"
am:
9e3f886dca
Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
Di Lu [Thu, 20 Jul 2017 07:27:16 +0000 (07:27 +0000)]
Merge "Add unit test for IpSecService"
Di Lu [Thu, 20 Jul 2017 06:04:11 +0000 (06:04 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c am:
73b7292a05
am:
eb7bc05b32
Change-Id: I399513b63dd5c06bab2946be315cc5c5689dff29
Di Lu [Thu, 20 Jul 2017 05:57:40 +0000 (05:57 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c
am:
73b7292a05
Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am:
dd494fa91c
Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
Andreas Gampe [Thu, 20 Jul 2017 05:49:05 +0000 (05:49 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6 am:
6078facf1f
am:
57ba0ddc91
Change-Id: Idac309f0674a33ef9dd3a6769c217568828f8f8d
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
Andreas Gampe [Thu, 20 Jul 2017 05:42:34 +0000 (05:42 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6
am:
6078facf1f
Change-Id: I360bf86dbd5ff0c0d3b0fd6bb207692fe1142bd1
Andreas Gampe [Thu, 20 Jul 2017 05:36:42 +0000 (05:36 +0000)]
Merge "Zygote: Poll with timeout for pid"
am:
89d119abe6
Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
Bill Yi [Thu, 20 Jul 2017 04:48:02 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ed6f707aa5196125419a43b85be6b9644364c24
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jeff Davidson [Thu, 20 Jul 2017 04:38:28 +0000 (04:38 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev am:
acdcf37e4b
am:
10238e562a
Change-Id: If5106972654149f5cb53aedae45964397dcfb69d
Jeff Davidson [Thu, 20 Jul 2017 04:32:21 +0000 (04:32 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
am:
acdcf37e4b
Change-Id: I10cc2501e38837f816c564716a6d157bc8f57ed6
Sudheer Shanka [Thu, 20 Jul 2017 04:28:19 +0000 (04:28 +0000)]
Merge "Assign cpu times to correct battery state bucket."
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecService
Test: runtest frameworks-net
Bug:
38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75
TreeHugger Robot [Thu, 20 Jul 2017 04:24:50 +0000 (04:24 +0000)]
Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
Philip Quinn [Thu, 20 Jul 2017 04:11:22 +0000 (04:11 +0000)]
Merge "Ping the StatusBar about power key events. am:
c3a503d8fd" into oc-dr1-dev-plus-aosp
am:
c5f9c329c1
Change-Id: I2906e0d6faae5a800cb70e13e5fb8fe590fe0bfa
Ahmed ElArabawy [Thu, 20 Jul 2017 04:09:02 +0000 (04:09 +0000)]
Merge "Add Configuration to APF Policy" am:
d27a6d62c6 am:
70291ef1d7 am:
2d0f47c40f -s ours
am:
7e8c7b806e -s ours
Change-Id: Ib093c053dad3f4560579c57c980cfc14e203cfa9
Android Build Merger (Role) [Thu, 20 Jul 2017 04:03:46 +0000 (04:03 +0000)]
Merge "Ping the StatusBar about power key events. am:
c3a503d8fd" into oc-dr1-dev-plus-aosp
Michael Plass [Thu, 20 Jul 2017 04:02:27 +0000 (04:02 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev am:
8d51d3e512
am:
231610fc1a
Change-Id: I4e0f4c17c9d09ec2c4f181705052912d370be0eb
Philip Quinn [Thu, 20 Jul 2017 04:01:51 +0000 (04:01 +0000)]
Ping the StatusBar about power key events.
am:
c3a503d8fd
Change-Id: I53c473abae0a58216bfa810d2e5df2da294d411d
Ahmed ElArabawy [Thu, 20 Jul 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Add Configuration to APF Policy" am:
d27a6d62c6 am:
70291ef1d7
am:
2d0f47c40f -s ours
Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf
Michael Plass [Thu, 20 Jul 2017 03:57:25 +0000 (03:57 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev
am:
8d51d3e512
Change-Id: Ic2e4c5d748ea33a3249fbd0b6520de347c6654ce
Ahmed ElArabawy [Thu, 20 Jul 2017 03:54:03 +0000 (03:54 +0000)]
Merge "Add Configuration to APF Policy" am:
d27a6d62c6
am:
70291ef1d7
Change-Id: Ib2881c42b6eb149ac4f964d9d8d29ac74a057000
Philip Quinn [Wed, 19 Jul 2017 06:23:41 +0000 (23:23 -0700)]
Ping the StatusBar about power key events.
Bug:
63183852
Test: runtest systemui
Change-Id: I5d8209396e3e761b404c1071a7004f34c6e6c927
TreeHugger Robot [Thu, 20 Jul 2017 03:49:56 +0000 (03:49 +0000)]
Merge "WifiInfo - document packet counters and rates" into oc-dr1-dev
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am:
d27a6d62c6
Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
TreeHugger Robot [Thu, 20 Jul 2017 03:42:13 +0000 (03:42 +0000)]
Merge "Rename vendorExtension fields to vendorInfo."
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
Jeff Sharkey [Thu, 20 Jul 2017 03:20:22 +0000 (03:20 +0000)]
Merge "Let's get a constant for O_MR1."
Jeff Sharkey [Wed, 19 Jul 2017 19:57:35 +0000 (13:57 -0600)]
Let's get a constant for O_MR1.
Test: none
Exempt-From-Owner-Approval: HULK SMASH!
Change-Id: I440ebae4d0891d9044bbbfb5beaaaa98639aea98
TreeHugger Robot [Thu, 20 Jul 2017 03:15:52 +0000 (03:15 +0000)]
Merge "Support list type on CustomDescription."
Steven Moreland [Thu, 20 Jul 2017 03:11:00 +0000 (03:11 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am:
826eafd958 am:
5c091dc944 am:
c840945a78
am:
9f430b2782
Change-Id: Ibe321dd4a8aae9342c76da0780edf94b90e8cd3a
TreeHugger Robot [Thu, 20 Jul 2017 03:07:15 +0000 (03:07 +0000)]
Merge "Fix splits class loader context for non dependant splits"
Steven Moreland [Thu, 20 Jul 2017 03:05:02 +0000 (03:05 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am:
826eafd958 am:
5c091dc944
am:
c840945a78
Change-Id: I654e14f0d1b495450db81592a2e564e308746350
Steven Moreland [Thu, 20 Jul 2017 02:58:46 +0000 (02:58 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am:
826eafd958
am:
5c091dc944
Change-Id: I582cc33d13d04950ca066074c292141605f3ca27
Steven Moreland [Thu, 20 Jul 2017 02:50:53 +0000 (02:50 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
am:
826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
Ahmed ElArabawy [Thu, 20 Jul 2017 02:49:54 +0000 (02:49 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev am:
5512504bba
am:
fe4ec9e946
Change-Id: I7dba5de4a5de74fd654ae5d1fe03abc625510f16
Andreas Gampe [Thu, 13 Jul 2017 02:17:52 +0000 (19:17 -0700)]
Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.
(cherry picked from commit
cbc421406193308667a38b0bebc16c4064a19e83)
Bug:
63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
Ahmed ElArabawy [Thu, 20 Jul 2017 02:43:54 +0000 (02:43 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev
am:
5512504bba
Change-Id: I3f6b818d34a2a54f73a7192d10d462b68d6e6ed0
Treehugger Robot [Thu, 20 Jul 2017 02:42:49 +0000 (02:42 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
TreeHugger Robot [Thu, 20 Jul 2017 02:37:56 +0000 (02:37 +0000)]
Merge "Fix format of subsystem power stats" into oc-dr1-dev
Ahmed ElArabawy [Tue, 13 Jun 2017 01:01:11 +0000 (18:01 -0700)]
Add Configuration to APF Policy
in b/
37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)
This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings
Bug:
37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry pick from commit
4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)
Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecManager
Test: runtest frameworks-net
Bug:
38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
TreeHugger Robot [Thu, 20 Jul 2017 01:55:46 +0000 (01:55 +0000)]
Merge "Don't show a custom description if any transformation fail."
Android Build Merger (Role) [Thu, 20 Jul 2017 01:40:47 +0000 (01:40 +0000)]
Merge "Expose KeyguardMonitor.isOccluded(). am:
1659b400b5 am:
bc5b6f4124"
Philip Quinn [Thu, 20 Jul 2017 01:39:34 +0000 (01:39 +0000)]
Expose KeyguardMonitor.isOccluded(). am:
1659b400b5
am:
bc5b6f4124
Change-Id: If64d9a23fe199d06080fd43dd1dfd990a7038fe2
Tomasz Wasilczyk [Thu, 20 Jul 2017 01:38:51 +0000 (01:38 +0000)]
Merge "Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio."
Philip Quinn [Thu, 20 Jul 2017 01:34:02 +0000 (01:34 +0000)]
Expose KeyguardMonitor.isOccluded().
am:
1659b400b5
Change-Id: I299c5a9b2fb93157622afa905c4c55918f46bf3e
TreeHugger Robot [Thu, 20 Jul 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Remove logspam of MediaRouter"
Philip Quinn [Wed, 19 Jul 2017 08:15:56 +0000 (01:15 -0700)]
Expose KeyguardMonitor.isOccluded().
Bug:
63806767
Test: runtest systemui
Change-Id: I36b96974c7a27e31ddbc3e8cdddf2516cce87b21
TreeHugger Robot [Thu, 20 Jul 2017 01:26:44 +0000 (01:26 +0000)]
Merge "Use scores from connected AP only."
Christine Franks [Thu, 20 Jul 2017 01:21:35 +0000 (01:21 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev am:
3789b629c7
am:
24416b86af
Change-Id: I56c901316a664aada485bf97a8f42596ea76d2bb
Christine Franks [Thu, 20 Jul 2017 01:15:48 +0000 (01:15 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev
am:
3789b629c7
Change-Id: I859bc8f2f1d314bb6a50741cb8e393be94cdbae6
TreeHugger Robot [Thu, 20 Jul 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Add status bar to fullscreen user switcher."
Christine Franks [Thu, 20 Jul 2017 01:04:51 +0000 (01:04 +0000)]
Merge "Add config_demoModePackage to symbols" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 00:59:00 +0000 (00:59 +0000)]
Merge "Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev am:
7bd4b3912b am:
187a26d602"
Peter Qiu [Thu, 20 Jul 2017 00:57:38 +0000 (00:57 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev am:
7bd4b3912b
am:
187a26d602
Change-Id: I1aaf401ef4e3125a5d7d5d65a6c415710266a2b3
TreeHugger Robot [Thu, 20 Jul 2017 00:56:39 +0000 (00:56 +0000)]
Merge "Adjust tests to new android-support-test + espresso libraries."
Peter Qiu [Thu, 20 Jul 2017 00:50:42 +0000 (00:50 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev
am:
7bd4b3912b
Change-Id: If2ac1228a2af3c0c59c603ed6de02b69c8e45b6c
Robert Greenwalt [Thu, 20 Jul 2017 00:49:58 +0000 (00:49 +0000)]
Merge "Add details to Download progress callback" am:
b440b572d7 am:
5f047a68d9 am:
12286b2608
am:
7acfec846b
Change-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44
TreeHugger Robot [Thu, 20 Jul 2017 00:46:05 +0000 (00:46 +0000)]
Merge "proto: add system message descriptor for Wi-Fi wrong password notification" into oc-dr1-dev
Calin Juravle [Thu, 20 Jul 2017 00:43:02 +0000 (00:43 +0000)]
Merge "Encode the entire class loader context for dex2oat"
Robert Greenwalt [Thu, 20 Jul 2017 00:42:21 +0000 (00:42 +0000)]
Merge "Add details to Download progress callback" am:
b440b572d7 am:
5f047a68d9
am:
12286b2608
Change-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8
Robert Greenwalt [Thu, 20 Jul 2017 00:36:53 +0000 (00:36 +0000)]
Merge "Add details to Download progress callback" am:
b440b572d7
am:
5f047a68d9
Change-Id: I5b26730aacb9209f08b33204fb88be02c324609a
Android Build Merger (Role) [Thu, 20 Jul 2017 00:34:14 +0000 (00:34 +0000)]
Merge "Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev am:
7b3bd1d547 am:
4dec845d52"
Sungsoo Lim [Thu, 20 Jul 2017 00:32:10 +0000 (00:32 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev am:
7b3bd1d547
am:
4dec845d52
Change-Id: I07d405b81ec43d720ec843a87e6a3bb07e03aea7
Robert Greenwalt [Thu, 20 Jul 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Add details to Download progress callback"
am:
b440b572d7
Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
TreeHugger Robot [Thu, 20 Jul 2017 00:29:59 +0000 (00:29 +0000)]
Merge "Add provider support for metadata extraction"
TreeHugger Robot [Thu, 20 Jul 2017 00:29:12 +0000 (00:29 +0000)]
Merge "Remove unnecessary orientation attribute."
Calin Juravle [Fri, 14 Jul 2017 23:40:07 +0000 (16:40 -0700)]
Fix splits class loader context for non dependant splits
If the app doesn't request for splits to be loaded in isolation or does
not declare inter-split dependencies, then all the splits are loaded in
the base apk class loader (in the order of they are defined).
Fix the class loader context passed to dex2oat to reflect the runtime
loading logic.
Bug:
38138251
Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
Change-Id: Ia0623d38883ae244fd16c0afb053fef016bf260a
TreeHugger Robot [Thu, 20 Jul 2017 00:25:19 +0000 (00:25 +0000)]
Merge "Remove unnecessary/misleading page indication dot."
Sungsoo Lim [Thu, 20 Jul 2017 00:25:11 +0000 (00:25 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
am:
7b3bd1d547
Change-Id: I0bf675f16c233b8b0a83f7bf20c9a42e3b76cbbb
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
Android Build Merger (Role) [Thu, 20 Jul 2017 00:21:59 +0000 (00:21 +0000)]
Merge "Merge "Add timezone for Telecom event date formatting" am:
bf296640e6 am:
5af59940d1 am:
af3d7f990a am:
19bf135234"
Hall Liu [Thu, 20 Jul 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Add timezone for Telecom event date formatting" am:
bf296640e6 am:
5af59940d1 am:
af3d7f990a
am:
19bf135234
Change-Id: If0d65df712331bd5552a0551a073a4bb09709b26
Ta-wei Yen [Thu, 20 Jul 2017 00:19:37 +0000 (00:19 +0000)]
Merge "Make EXTRA_IS_REFRESH for voicemail notification public"
TreeHugger Robot [Thu, 20 Jul 2017 00:18:20 +0000 (00:18 +0000)]
Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 00:17:35 +0000 (00:17 +0000)]
Merge "Add a command line option to optimize individual splits"
TreeHugger Robot [Thu, 20 Jul 2017 00:17:12 +0000 (00:17 +0000)]
Merge "Refactor the arguments passed to dexopt invocations"
Mady Mellor [Thu, 20 Jul 2017 00:14:44 +0000 (00:14 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev am:
f113a07d9e
am:
b2e49ed777
Change-Id: Ia6816270e7eb4fd2ff3a6e1fb14238b2bbd92d9e
Christine Franks [Wed, 19 Jul 2017 22:41:34 +0000 (15:41 -0700)]
Add config_demoModePackage to symbols
Bug:
62712426
Test: make -j100
Change-Id: I95a398a74d273d0aa7639989a367e902b305fa6c
Hall Liu [Thu, 20 Jul 2017 00:13:08 +0000 (00:13 +0000)]
Merge "Add timezone for Telecom event date formatting" am:
bf296640e6 am:
5af59940d1
am:
af3d7f990a
Change-Id: I1ca12b34a39a45512c9df6a2daeb5f72cd686f3e
Seigo Nonaka [Thu, 20 Jul 2017 00:09:07 +0000 (00:09 +0000)]
Merge "Fix race condition of removing surface." into oc-dr1-dev am:
e6685b2bcd
am:
0888ce471a
Change-Id: I42acf3be8a10dd03239ea3e55381f3893f28938f
Mady Mellor [Thu, 20 Jul 2017 00:09:05 +0000 (00:09 +0000)]
Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
am:
f113a07d9e
Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7
OSDN Git Service
