OSDN Git Service
Sundeep Ghuman [Sat, 8 Jul 2017 03:13:09 +0000 (03:13 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
am:
e72ec3cab2
Change-Id: If268b2db323fa52c92fccc1b259599a0be204b87
TreeHugger Robot [Sat, 8 Jul 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Change initial value of mStaleScanResults to true." into oc-dr1-dev
Sundeep Ghuman [Wed, 5 Jul 2017 21:19:30 +0000 (14:19 -0700)]
Change initial value of mStaleScanResults to true.
In ag/
2409026 we introduced a stale scan result bit to prevent callbacks
from sticky broadcasts from occuring until we have fetched the latest
set of scan results. However, this initial value was set to false hence
there is a race condition in which the currently connected network can
still be shown without any other networks, as the scan results have not
yet been processed.
By changing the initial value to true, we address this race condition.
Bug: b/
62493360
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I5f2108e17d2c549e2176ccf64e640fbd4808b5f1
Lucas Dupin [Sat, 8 Jul 2017 00:26:50 +0000 (00:26 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
am:
456cb9603a
Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150
TreeHugger Robot [Sat, 8 Jul 2017 00:21:44 +0000 (00:21 +0000)]
Merge "Moving color extraction classes" into oc-dr1-dev
Etan Cohen [Fri, 7 Jul 2017 23:21:05 +0000 (23:21 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
am:
9aabf29541
Change-Id: Ibdf4c9f91a41ba68c2d5ece4615a12e101638471
Derek Tan [Fri, 7 Jul 2017 23:18:54 +0000 (23:18 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am:
f1328fee0d
Change-Id: I8646c7983330beaf90f7935d01675f33df2bf7ef
Wale Ogunwale [Fri, 7 Jul 2017 23:17:26 +0000 (23:17 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
am:
d4b83f96f8
Change-Id: I0be58fbdffafd87919fe259914af3855e3768b0f
Etan Cohen [Fri, 7 Jul 2017 23:13:34 +0000 (23:13 +0000)]
Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
Derek Tan [Fri, 7 Jul 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
Wale Ogunwale [Fri, 7 Jul 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Don't remove starting window for visible app." into oc-dr1-dev
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
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"
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
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
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
Julia Reynolds [Fri, 7 Jul 2017 19:24:37 +0000 (19:24 +0000)]
Merge "Allow setup apps to colorize notifications." into oc-dr1-dev
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
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
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
TreeHugger Robot [Fri, 7 Jul 2017 17:55:54 +0000 (17:55 +0000)]
Merge "Fix announcement of global actions menu" into oc-dr1-dev
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
Merged-In: I7c4cf5c40a88555e81fbad9bec2b32c55c927468
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
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
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
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
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
TreeHugger Robot [Fri, 7 Jul 2017 16:42:03 +0000 (16:42 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 16:18:34 +0000 (16:18 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp
Adrian Roos [Fri, 7 Jul 2017 16:17:35 +0000 (16:17 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
am:
3bd612f92b
Change-Id: I2ab9a1842c6e9a5acdde4d5c3470bf645aa55e18
Adrian Roos [Fri, 7 Jul 2017 16:16:31 +0000 (16:16 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
am:
3bd612f92b
Change-Id: I42ac8090c978c7b42ab11c19a89e4c15327c0a8f
TreeHugger Robot [Fri, 7 Jul 2017 16:10:13 +0000 (16:10 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 16:00:55 +0000 (16:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:59:35 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2fb78bafc7 -s ours
Change-Id: Ie2fb8eaa3d8200f63340cb2103d12ef921eb7903
Bill Yi [Fri, 7 Jul 2017 15:59:30 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2fb78bafc7 -s ours
Change-Id: If579306318f2f38af5c11359e59b357ea0942b56
Android Build Merger (Role) [Fri, 7 Jul 2017 15:56:53 +0000 (15:56 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:55:58 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9da0a744c5 -s ours
Change-Id: Ic856cb8ca560d42fae8f1b6499716300f39218c8
Android Build Merger (Role) [Fri, 7 Jul 2017 15:55:40 +0000 (15:55 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
33393ffa7d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:54:31 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
33393ffa7d -s ours
Change-Id: If4cd6d9504c519c186e1f3a1913ed91e81a3ae6b
Bill Yi [Fri, 7 Jul 2017 15:54:03 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9da0a744c5 -s ours
Change-Id: Ib4c07c473d892138f9df7bdf898f234f9bc990f0
Bill Yi [Fri, 7 Jul 2017 15:52:50 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
33393ffa7d -s ours
Change-Id: I43463ebcdccbd71229ee344a6af7b943a94d2dda
TreeHugger Robot [Fri, 7 Jul 2017 15:52:21 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 15:40:25 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 15:39:04 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jason Monk [Fri, 7 Jul 2017 15:35:13 +0000 (11:35 -0400)]
Fix announcement of global actions menu
Make sure it has focus when it opens so that it can announce.
Test: manual
Change-Id: Ie1795faf5c9b79eb20f538b9dc6f4cb1f04babfb
Fixes:
62433101
Adrian Roos [Fri, 7 Jul 2017 15:10:11 +0000 (17:10 +0200)]
AOD: Finish pulse when notification is removed
Change-Id: I346e7ef77cc3c9bb2c72bd028953f0e5ff757502
Fixes:
38174509
Test: receive notification while phone off (with or without AOD). Swipe away notification. Verify that it goes back to the base state immediately
Jason Monk [Fri, 7 Jul 2017 14:36:03 +0000 (10:36 -0400)]
Fix clipping of large global actions items
Test: visual
Change-Id: I9f652642055d190e2368dab89fe56518fb15eb19
Fixes:
63150552
Adrian Roos [Fri, 7 Jul 2017 13:58:57 +0000 (15:58 +0200)]
AOD: Keep doze brightness when unlocking with fingerprint
Updates the logic that was already in place to prevent lighting up
the display before the unlock transition starts:
- treat AOD as pulsing in FingerprintUnlockController
- now that doze can use more than one brightness level, use the current
Bug:
62885451
Test: Unlock with fingerprint from AOD. Observe that the unlock transition does not prematurely change the brightness level
Change-Id: I266bd5e4c0a1d5b4c347a65c0e7936247e333cfc
Wale Ogunwale [Thu, 6 Jul 2017 22:30:55 +0000 (15:30 -0700)]
Don't remove starting window for visible app.
Activity manager agressively removes starting windows to avoid leaks.
See ag/696830 and ag/
1213075 for some history. However, it is possible
for window manager to process the request of removing the starting window
coming from activity manager while the app token for the starting window
is still visible from the window manager side because we are delaying
hiding it due to an animation in progress.
We now only process the request to remove starting window from the
activity manager side if the app is hidden on the window manager side.
Change-Id: Ia33076f0e7405f9430e9d4e9d4026ae6fd1b133e
Fixes:
62443388
Test: go/wm-smoke
Test: Swipe Gmail away in Recents, launch Chome, press home button, launch Gmail, and press the home button.
Android Build Merger (Role) [Fri, 7 Jul 2017 12:45:08 +0000 (12:45 +0000)]
Merge "Merge "Fix translation direction in QS animation" into oc-dr1-dev am:
feb5dc3b26" into oc-dr1-dev-plus-aosp
Jason Monk [Fri, 7 Jul 2017 12:43:55 +0000 (12:43 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
am:
feb5dc3b26
Change-Id: I1c96516294b275eedcd543958ecbd45bad014a59
Jason Monk [Fri, 7 Jul 2017 12:42:45 +0000 (12:42 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
am:
feb5dc3b26
Change-Id: Ib59b2670a1d031b52b9ca9427fb1dbfe2286f3c9
Jason Monk [Fri, 7 Jul 2017 12:36:11 +0000 (12:36 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 11:28:58 +0000 (11:28 +0000)]
Merge "Merge "Keeping notifications around that show guts" into oc-dr1-dev am:
ea2cbdecca" into oc-dr1-dev-plus-aosp
Adrian Roos [Fri, 7 Jul 2017 11:27:39 +0000 (11:27 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
am:
ea2cbdecca
Change-Id: Ib74148ab149d4158b985c7813542b63e8e6c61f4
Adrian Roos [Fri, 7 Jul 2017 11:27:15 +0000 (11:27 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
am:
ea2cbdecca
Change-Id: Ie9e2152a7aadf1f9b3cd42aa6a3791cb62ab34bc
Adrian Roos [Fri, 7 Jul 2017 11:22:51 +0000 (11:22 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 10:20:21 +0000 (12:20 +0200)]
AOD: Fix possible NPE in DozeSensors
Fixes an NPE that can happen if the ProximitySensor callback
unregisters the proximity sensor.
Change-Id: I8df1cf98e5334b3ff35c19b30bb7e01d0ebcfd6a
Fixes:
63357752
Test: Squint at the code *really hard*
Adrian Roos [Fri, 7 Jul 2017 10:08:36 +0000 (10:08 +0000)]
Merge "AOD: Add logging" into oc-dr1-dev
am:
22b76d5deb
Change-Id: I478d38cf4681fd45b094fdad6f1e9df5ecd17b37
Adrian Roos [Fri, 7 Jul 2017 10:03:05 +0000 (10:03 +0000)]
Merge "AOD: Add logging" into oc-dr1-dev
Bill Yi [Fri, 7 Jul 2017 09:16:14 +0000 (02:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f7d8a0b363893098604e0b912974ca56b67100c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Fri, 7 Jul 2017 07:58:30 +0000 (07:58 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
d7e6de2267" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:57:33 +0000 (07:57 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
d7e6de2267
Change-Id: I071316f1e00d71edb16d17bb8c2971ec7f665768
Android Build Merger (Role) [Fri, 7 Jul 2017 07:57:30 +0000 (07:57 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
d7e6de2267" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:56:41 +0000 (07:56 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:56:25 +0000 (07:56 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
d7e6de2267
Change-Id: Ica715d36549f120a63ad70ce348ba6032ffc3eaa
Android Build Merger (Role) [Fri, 7 Jul 2017 07:55:30 +0000 (07:55 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:55:27 +0000 (07:55 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: If58174412aeaaad00a49143c67c19e1fef191709
Android Build Merger (Role) [Fri, 7 Jul 2017 07:54:43 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:54:30 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: I9ad7c61b3a068246d486f81ec4d0929ebd787ace
Adam Vartanian [Fri, 7 Jul 2017 07:53:40 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: Ie057e5a870c9e58b4999cecb56c19aaca6183121
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:33 +0000 (07:53 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:04 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793 am:
5cba3b343f" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:52:21 +0000 (07:52 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: I43b7bb188a723e131056adc5e85571003c0bad21
OSDN Git Service
