OSDN Git Service
TreeHugger Robot [Fri, 7 Jul 2017 22:33:29 +0000 (22:33 +0000)]
Merge "Revert "Change initial value of mStaleScanResults to false.""
TreeHugger Robot [Fri, 7 Jul 2017 22:21:21 +0000 (22:21 +0000)]
Merge "Use a separate lock object instead of mSpellCheckerMap"
Xiangyu/Malcolm Chen [Fri, 7 Jul 2017 22:16:32 +0000 (22:16 +0000)]
Merge "Provide materials for Mobile network settings UI."
TreeHugger Robot [Fri, 7 Jul 2017 22:06:54 +0000 (22:06 +0000)]
Merge "Moving color extraction classes"
Amith Yamasani [Fri, 7 Jul 2017 21:54:31 +0000 (21:54 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev am:
2a8a58ea98
am:
6a4ab438b9
Change-Id: I4d4ba6681ebda8ba7bfe0ca9117243377b53478a
Amith Yamasani [Fri, 7 Jul 2017 21:50:29 +0000 (21:50 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
am:
2a8a58ea98
Change-Id: Ic043ad8fd15aac4583be3944190b52f3e914c6d7
Kouji Shiotani [Fri, 7 Jul 2017 21:46:11 +0000 (21:46 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449 am:
1249e0a1b0 am:
03f4ddb1b2
am:
41369279a2
Change-Id: I067a46e3c4937c5cc3713d1f4080975ff8aa3698
TreeHugger Robot [Fri, 7 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Merge "Add logging for unusually long read times" into oc-dr1-dev
Kouji Shiotani [Fri, 7 Jul 2017 21:39:39 +0000 (21:39 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449 am:
1249e0a1b0
am:
03f4ddb1b2
Change-Id: Iafd1e341d6e1054453bf1db6d880abe227fac631
Kouji Shiotani [Fri, 7 Jul 2017 21:34:32 +0000 (21:34 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449
am:
1249e0a1b0
Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb
Kouji Shiotani [Fri, 7 Jul 2017 21:28:43 +0000 (21:28 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
am:
87e893a449
Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46
Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
Fyodor Kupolov [Fri, 7 Jul 2017 21:20:09 +0000 (21:20 +0000)]
Merge "Disable lookaside allocator on low-RAM devices"
Joe LaPenna [Fri, 7 Jul 2017 18:09:45 +0000 (18:09 +0000)]
Revert "Change initial value of mStaleScanResults to false."
This reverts commit
bd5410fa4845b9975e8544071d5e590adf5db0f0.
Reason for revert: Changelist description was incorrect, which can cause issues when debugging and reading commit logs, in the future.
Change-Id: Ic70c5f1822ab6f1b77486097fadcf3bdf3484e32
Evan Laird [Fri, 7 Jul 2017 19:56:03 +0000 (19:56 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev am:
845a4035ae
am:
2b155ef39c
Change-Id: I301dd1bc64c4105612107ddfd19f88da696b9d21
Evan Laird [Fri, 7 Jul 2017 19:51:35 +0000 (19:51 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev am:
1948abac4a
am:
390dfa2b28
Change-Id: I4cfa001d34d15cca57889a50dcd156ec96690d81
Evan Laird [Fri, 7 Jul 2017 19:47:57 +0000 (19:47 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
am:
845a4035ae
Change-Id: I6474c59be48650b2e5f6ea45489c59b8bb36d3cd
jackqdyulei [Fri, 7 Jul 2017 19:47:03 +0000 (19:47 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev am:
0ff3a3a11c
am:
112b16af3e
Change-Id: I3c1ebf5eb3fe551f61d80603a3c6bc1c83a84126
Evan Laird [Fri, 7 Jul 2017 19:44:58 +0000 (19:44 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev
am:
1948abac4a
Change-Id: I9ebd8fd915a1292682785e5742da8b98563b893e
Julia Reynolds [Fri, 7 Jul 2017 19:42:57 +0000 (19:42 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev am:
e4101089bb
am:
6b734d0478 -s ours
Change-Id: I2e16c19fc248457d3d9a54063e6d897db7dc02c3
jackqdyulei [Fri, 7 Jul 2017 19:40:08 +0000 (19:40 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
am:
0ff3a3a11c
Change-Id: I271ee0902cef0554e02e5a268488986366e3dbf9
TreeHugger Robot [Fri, 7 Jul 2017 19:37:19 +0000 (19:37 +0000)]
Merge "Fix RTL drawing for QS tiles in edit mode" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:34:49 +0000 (19:34 +0000)]
Merge "Update brightness icon to rounded one" into oc-dr1-dev
Julia Reynolds [Fri, 7 Jul 2017 19:31:57 +0000 (19:31 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
am:
e4101089bb
Change-Id: I14f8f499ac62ed47d40ca9b2a7bff0c79120dcd7
TreeHugger Robot [Fri, 7 Jul 2017 19:31:54 +0000 (19:31 +0000)]
Merge "Make BatterySaverTile controlled by pluggIn state" into oc-dr1-dev
Roozbeh Pournader [Fri, 7 Jul 2017 19:30:11 +0000 (19:30 +0000)]
Merge "Trying to fix flaky tests related to testCharSequence*"
Julia Reynolds [Fri, 7 Jul 2017 19:24:37 +0000 (19:24 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
Andrew Solovay [Fri, 7 Jul 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4 am:
465810c895" into oc-dr1-dev-plus-aosp
am:
ad8f53420d
Change-Id: I30172dc7c68683d37dbf7eacb6f771d022c307b9
Andrew Solovay [Fri, 7 Jul 2017 19:21:43 +0000 (19:21 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4 am:
bc4dc42887
am:
967bae0cf6
Change-Id: Ied39e43b0e3528984c086346f8e60fde99cb8def
Android Build Merger (Role) [Fri, 7 Jul 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4 am:
465810c895" into oc-dr1-dev-plus-aosp
Adrian Roos [Fri, 7 Jul 2017 19:17:27 +0000 (19:17 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev am:
eacef7a03a
am:
f53f45e06f
Change-Id: I58f11a9e583a4af800868b47e90636c342425745
Andrew Solovay [Fri, 7 Jul 2017 19:17:12 +0000 (19:17 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4
am:
465810c895
Change-Id: I6a9fa071f8e48c36cb0c9fdece919b6be0e8dc51
Andrew Solovay [Fri, 7 Jul 2017 19:15:29 +0000 (19:15 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev am:
1cdf4244f4
am:
bc4dc42887
Change-Id: I96a162db5fc80ab578a206ca13bd193a33762a64
Adrian Roos [Fri, 7 Jul 2017 19:12:31 +0000 (19:12 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev
am:
eacef7a03a
Change-Id: I8e29473caf7c1cbef065909b0b40212b82648a95
Andrew Solovay [Fri, 7 Jul 2017 19:09:39 +0000 (19:09 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I1c25c17f1f73e4006e3b0fa9479d5b0563c6be98
Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I295298edcd7f26df46edb71924fa63038a381619
TreeHugger Robot [Fri, 7 Jul 2017 19:07:32 +0000 (19:07 +0000)]
Merge "AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete" into oc-dr1-dev
Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Jason Monk [Fri, 7 Jul 2017 18:35:37 +0000 (18:35 +0000)]
Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am:
5d378e5f2a" into oc-dr1-dev-plus-aosp
am:
f627f51b4f
Change-Id: Ic0c577547f83080fc2dd9032cb373870d7cf2a0c
Jason Monk [Fri, 7 Jul 2017 18:33:59 +0000 (18:33 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev am:
5d378e5f2a
am:
67ea803425
Change-Id: I4a5a2ad36d792c5edd335e77c61c5fc0d5ec75d5
Lucas Dupin [Thu, 6 Jul 2017 21:35:30 +0000 (14:35 -0700)]
Moving color extraction classes
Fixes:
62220212
Test: make
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: runtest systemui
Change-Id: I7c4cf5c40a88555e81fbad9bec2b32c55c927468
Android Build Merger (Role) [Fri, 7 Jul 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am:
5d378e5f2a" into oc-dr1-dev-plus-aosp
Jason Monk [Fri, 7 Jul 2017 18:04:11 +0000 (18:04 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
am:
5d378e5f2a
Change-Id: I70c42c2febf4cfcd23584bdf151937857d8982ba
Jason Monk [Fri, 7 Jul 2017 18:03:59 +0000 (18:03 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
am:
5d378e5f2a
Change-Id: I10d404f2f5ea4388d4c5d31dce129902410279b4
Guliz Tuncay [Fri, 7 Jul 2017 17:35:59 +0000 (10:35 -0700)]
Use a separate lock object instead of mSpellCheckerMap
In order to make TSMS multi-user aware, the first step is to get rid of
the use of user-specific mSpellCheckerMap (since there will be one for
each user) in the synchronized blocks, and instead use a separate
object lock.
Bug:
63041121
Test: Manually tested as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. Make sure AOSP Keyboard (com.android.inputmethod.latin)
is installed.
4. adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
5. Observe that there are no bindings to the selected spell
checker service (SCS) by running
adb shell dumpsys textservices
6. Observe that there is no connection to selected SCS by running
adb shell dumpsys activity services com.android.inputmethod.latin
There should be no ConnectionRecord for
AndroidSpellCheckerService
7. Run a test program that has TextView and tap on one of the
TextViews and type some text.
8. Repeat steps 5 and 6 to observe there are now bindings and
connection to the selected SCS.
9. Kill the app manually. Repeat steps 5 and 6 to see bindings
and connections are removed again.
10. adb shell settings put secure selected_spell_checker com.google.android.inputmethod.latin/com.android.inputmethod.latin.spellcheck.AndroidSpellCheckerService
11. Repeat 7, 8, 9.
12. Switch to a secondary user account. Repeat 3-11.
Change-Id: Ic8772accb4c6225a1e662fd2fa371b2f4c87e445
Android Build Merger (Role) [Fri, 7 Jul 2017 17:56:47 +0000 (17:56 +0000)]
Merge "Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am:
d7aa26f33b am:
bdc9d47c62"
TreeHugger Robot [Fri, 7 Jul 2017 17:55:54 +0000 (17:55 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 17:55:43 +0000 (17:55 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am:
d7aa26f33b
am:
bdc9d47c62
Change-Id: I7ce204de73542f590f9f2cf8441ef8010315cbed
Adrian Roos [Fri, 7 Jul 2017 17:54:34 +0000 (17:54 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am:
d7aa26f33b
am:
bdc9d47c62
Change-Id: Ife7e47b06d08967a210ae6db46bbaa015926302e
Adrian Roos [Fri, 7 Jul 2017 17:53:12 +0000 (17:53 +0000)]
Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev am:
7bed78952e
am:
7be2711d7c
Change-Id: I83bb778ff97b0ac3e88e35e2112a357cd136d0eb
Android Build Merger (Role) [Fri, 7 Jul 2017 17:50:32 +0000 (17:50 +0000)]
Merge "Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am:
bd17b31310" into oc-dr1-dev-plus-aosp am:
5d8f843c2c"
Lucas Dupin [Fri, 7 Jul 2017 17:48:44 +0000 (17:48 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am:
bd17b31310" into oc-dr1-dev-plus-aosp
am:
5d8f843c2c
Change-Id: Ic5bb317fc3cff648dec1174df536033a8ab0f217
Android Build Merger (Role) [Fri, 7 Jul 2017 17:47:07 +0000 (17:47 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am:
bd17b31310 am:
3f8a36052b"
TreeHugger Robot [Fri, 7 Jul 2017 17:46:42 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Lucas Dupin [Fri, 7 Jul 2017 17:45:21 +0000 (17:45 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am:
bd17b31310
am:
3f8a36052b
Change-Id: Ie66ba8d4fbc26bb256239d5c1b064210c19eb8ab
Evan Laird [Tue, 27 Jun 2017 17:33:40 +0000 (13:33 -0400)]
Update brightness icon to rounded one
This is part of the icon updates for DR. Should be there.
Test: visual
Bug:
62668861
Change-Id: I11c8ddd99de90c319143292cd32441d14eb7fc1d
(cherry picked from commit
801705bbea9637bf709e4579ef708f90bb92e311)
Adrian Roos [Fri, 7 Jul 2017 17:44:47 +0000 (17:44 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev
am:
d7aa26f33b
Change-Id: Iadaf84ba4425de21c40dbf4ebe373e6143833c94
Adrian Roos [Fri, 7 Jul 2017 17:40:58 +0000 (17:40 +0000)]
Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
am:
7bed78952e
Change-Id: Id8761920bb2beca8bdf96f69d6915548836594b3
TreeHugger Robot [Fri, 7 Jul 2017 17:40:13 +0000 (17:40 +0000)]
Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 17:37:28 +0000 (17:37 +0000)]
Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am:
bd17b31310" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 7 Jul 2017 17:35:29 +0000 (17:35 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am:
bd17b31310
Change-Id: If36e86322bbf8573c87d84a9ec15a350bb3f60db
Lucas Dupin [Fri, 7 Jul 2017 17:35:12 +0000 (17:35 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am:
bd17b31310
Change-Id: Ia143a2ed0048bd9a3c1439b9be9b0aebfeafdf69
Shubham Ajmera [Fri, 7 Jul 2017 17:28:36 +0000 (17:28 +0000)]
Merge "Compile secondary dex at boot after OTA"
TreeHugger Robot [Fri, 7 Jul 2017 17:28:10 +0000 (17:28 +0000)]
Merge "AOD: Finish pulse when notification is removed" into oc-dr1-dev
Evan Laird [Fri, 7 Jul 2017 17:24:56 +0000 (13:24 -0400)]
Fix RTL drawing for QS tiles in edit mode
When in RTL mode, sometimes the tile displaying the mobile signal was
not properly set (was drawing as LTR). Setting it explicitly during
QSIconViewImpl#updateTile() fixes the issue.
Test: visual
Bug:
63160044
Change-Id: If00b149ca0372fc3d51fc2ee53a43e3b74e78791
Lucas Dupin [Fri, 7 Jul 2017 17:23:22 +0000 (17:23 +0000)]
Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
Julia Reynolds [Fri, 30 Jun 2017 17:34:01 +0000 (13:34 -0400)]
Allow setup apps to colorize notifications.
Fixes:
63147379
Test: runtest systemui-notification, core tests
Change-Id: I2077a9fd563826d978d0dc01be89dd0bbc09eebf
Android Build Merger (Role) [Fri, 7 Jul 2017 17:19:07 +0000 (17:19 +0000)]
Merge "Merge "Fix clipping of large global actions items" into oc-dr1-dev am:
e7e2f36a47 am:
231dc0eabd"
Jason Monk [Fri, 7 Jul 2017 17:18:03 +0000 (17:18 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev am:
e7e2f36a47
am:
231dc0eabd
Change-Id: I61ce6b797fda286ae8a4f4e9d33719939d528804
Jason Monk [Fri, 7 Jul 2017 17:17:33 +0000 (17:17 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev am:
e7e2f36a47
am:
231dc0eabd
Change-Id: I5731ff365dbd5427ccd271e0079224553bf566f7
Jason Monk [Fri, 7 Jul 2017 17:10:01 +0000 (17:10 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev
am:
e7e2f36a47
Change-Id: Ib7ecd54f85c22d7f2cf88d254ea5b746641c6e64
Android Build Merger (Role) [Fri, 7 Jul 2017 17:04:06 +0000 (17:04 +0000)]
Merge "Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev am:
1a16b17ed1 am:
f49509726c"
Adrian Roos [Fri, 7 Jul 2017 17:03:00 +0000 (17:03 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev am:
1a16b17ed1
am:
f49509726c
Change-Id: I64739cb5eba579af0801b2754e3ee17dae2938a3
Adrian Roos [Fri, 7 Jul 2017 17:02:37 +0000 (17:02 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev am:
1a16b17ed1
am:
f49509726c
Change-Id: Idb2e78b145de69f545d780dd3c93cefb1a63b7d4
Adrian Roos [Fri, 7 Jul 2017 17:02:34 +0000 (19:02 +0200)]
AOD: Block when fingerprint is already authenticated but waiting for goingToSleep to complete
Improves an issue where immediately triggering fingerprint after
the devices goes to sleep results in a lot of flickering.
There's still flicker however if the fingerprint authenticates after we've requested the AOD
display state, but before it has actually been applied.
Bug:
62887179
Test: Go to Home. Lock screen. Immediately unlock via fingerprint. Verify that the AOD screen does not even show.
Change-Id: Ib6425eee803a8c7e02f9621a571e562e825af57f
TreeHugger Robot [Fri, 7 Jul 2017 17:00:12 +0000 (17:00 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 16:53:17 +0000 (16:53 +0000)]
Merge "Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp am:
15476e332e"
Adrian Roos [Fri, 7 Jul 2017 16:52:03 +0000 (16:52 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp
am:
15476e332e
Change-Id: I5897c2c2280c404836e0e80e459972fbc34c528d
Android Build Merger (Role) [Fri, 7 Jul 2017 16:51:35 +0000 (16:51 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b am:
1b94e6c444"
Adrian Roos [Fri, 7 Jul 2017 16:51:30 +0000 (16:51 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
am:
1a16b17ed1
Change-Id: Ibcaff980c79f0bdc2a0567d6fcea2b8e29ab50b8
Adrian Roos [Fri, 7 Jul 2017 16:50:27 +0000 (16:50 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b
am:
1b94e6c444
Change-Id: I72f3175ee0bd723a6570c7f5dd3d9088ef39ea05
Android Build Merger (Role) [Fri, 7 Jul 2017 16:50:07 +0000 (16:50 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp am:
fba5a5bad9 -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 16:49:17 +0000 (16:49 +0000)]
Merge "Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp am:
15476e332e"
Bill Yi [Fri, 7 Jul 2017 16:48:45 +0000 (16:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp
am:
fba5a5bad9 -s ours
Change-Id: I1cc3d6b992640aafb79815c4c25921cf98afcb60
Android Build Merger (Role) [Fri, 7 Jul 2017 16:48:28 +0000 (16:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours am:
4a4b0e5726 -s ours"
Adrian Roos [Fri, 7 Jul 2017 16:48:03 +0000 (16:48 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp
am:
15476e332e
Change-Id: I8a0d5e6c7b1c90828b24ed1a5e951dec9ceca84e
Android Build Merger (Role) [Fri, 7 Jul 2017 16:47:41 +0000 (16:47 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b am:
1b94e6c444"
Bill Yi [Fri, 7 Jul 2017 16:47:35 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours
am:
4a4b0e5726 -s ours
Change-Id: Ie1d846377804bec15366f3d2ae97e7dbcba3730f
Android Build Merger (Role) [Fri, 7 Jul 2017 16:47:08 +0000 (16:47 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp am:
7945f44af0 -s ours"
Adrian Roos [Fri, 7 Jul 2017 16:46:39 +0000 (16:46 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b
am:
1b94e6c444
Change-Id: I95b9aa4773fafb62d5c8d440a90a93d8cfd54db3
Android Build Merger (Role) [Fri, 7 Jul 2017 16:46:19 +0000 (16:46 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp am:
fba5a5bad9 -s ours"
Bill Yi [Fri, 7 Jul 2017 16:46:07 +0000 (16:46 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp
am:
7945f44af0 -s ours
Change-Id: I6e99c903d9f0b8d7172d74dc5cffd9242c69a0eb
Android Build Merger (Role) [Fri, 7 Jul 2017 16:45:42 +0000 (16:45 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
33393ffa7d -s ours" into oc-dr1-dev-plus-aosp am:
fa5e729d42 -s ours"
Bill Yi [Fri, 7 Jul 2017 16:45:12 +0000 (16:45 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp
am:
fba5a5bad9 -s ours
Change-Id: I7fa39b07454bda35ecc325fe9910104a5761da81
Android Build Merger (Role) [Fri, 7 Jul 2017 16:44:53 +0000 (16:44 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours am:
4a4b0e5726 -s ours"
Bill Yi [Fri, 7 Jul 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
33393ffa7d -s ours" into oc-dr1-dev-plus-aosp
am:
fa5e729d42 -s ours
Change-Id: I64c768e61855963f4f26953a2ea6630702dff652
Android Build Merger (Role) [Fri, 7 Jul 2017 16:44:15 +0000 (16:44 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours am:
a56ea23d9c -s ours"
Bill Yi [Fri, 7 Jul 2017 16:43:46 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours
am:
4a4b0e5726 -s ours
Change-Id: Id36ca27107f7250850ff5c2004a70b55fb206c31
Android Build Merger (Role) [Fri, 7 Jul 2017 16:43:26 +0000 (16:43 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp am:
7945f44af0 -s ours"
Bill Yi [Fri, 7 Jul 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours
am:
a56ea23d9c -s ours
Change-Id: Ia3432072146b9fd6abac4a83ce3869ead70ff600
OSDN Git Service
