OSDN Git Service
Zak Cohen [Tue, 27 Jun 2017 15:54:51 +0000 (15:54 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
am:
d20db5a0bd
Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d
TreeHugger Robot [Tue, 27 Jun 2017 15:47:50 +0000 (15:47 +0000)]
Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
Android Build Merger (Role) [Tue, 27 Jun 2017 13:10:28 +0000 (13:10 +0000)]
Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683 am:
9f84093386" into oc-dr1-dev-plus-aosp
Kenny Guy [Tue, 27 Jun 2017 13:09:42 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
8954507d8c
Change-Id: I4688c240fbed0e82caf114579ed2e6f5946e0ee0
Kenny Guy [Tue, 27 Jun 2017 13:09:39 +0000 (13:09 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am:
ba18b0c683
am:
9f84093386
Change-Id: I337bdeba957957414eaad3f981488fc8d8ebbd32
Kenny Guy [Tue, 27 Jun 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: I80adc11fae6eb7ed72c1f304a560e2a5c9f93108
Kenny Guy [Tue, 27 Jun 2017 13:04:35 +0000 (13:04 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
am:
ba18b0c683
Change-Id: Ib663cf469da3b1cc5c41b385302db3c107290d23
TreeHugger Robot [Tue, 27 Jun 2017 12:55:39 +0000 (12:55 +0000)]
Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev
Rubin Xu [Tue, 27 Jun 2017 12:36:10 +0000 (12:36 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
am:
23ed7d7699
Change-Id: I5a1315765c6b0dca3c7ffca914a56a34bffd0f44
TreeHugger Robot [Tue, 27 Jun 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Do not call into ActivityManager when holding mSpManager lock" into oc-dr1-dev
Neil Fuller [Tue, 27 Jun 2017 12:16:20 +0000 (12:16 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e am:
4fee968fa8
am:
dbe6beb0bb
Change-Id: Ie3c352bc87cf6cd74a1e073efe4a99b518b133e4
Neil Fuller [Tue, 27 Jun 2017 12:10:37 +0000 (12:10 +0000)]
Merge "Switch to streaming data for time zone update" am:
f093d4e13e
am:
4fee968fa8
Change-Id: I042861293371d07f62b05b28dc7c3a2ffb090812
Neil Fuller [Tue, 27 Jun 2017 12:05:17 +0000 (12:05 +0000)]
Merge "Switch to streaming data for time zone update"
am:
f093d4e13e
Change-Id: I3fd22fe47e1d7b86d4f88d527940c6812ecfa31b
Neil Fuller [Tue, 27 Jun 2017 11:56:53 +0000 (11:56 +0000)]
Merge "Switch to streaming data for time zone update"
Paul Duffin [Tue, 27 Jun 2017 11:41:44 +0000 (11:41 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours am:
1cd40dac5c
am:
8e6690f35a
Change-Id: If29cf2a91dc5d91a50aa7d51604f0a054fce352a
Android Build Merger (Role) [Tue, 27 Jun 2017 11:36:20 +0000 (11:36 +0000)]
Merge "Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787 am:
889d326eda" into oc-dr1-dev-plus-aosp
Julius D'souza [Tue, 27 Jun 2017 11:35:13 +0000 (11:35 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787
am:
889d326eda
Change-Id: I23af9d8a67d862b6d72ac41408926085bd8ef4a7
Julius D'souza [Tue, 27 Jun 2017 11:35:04 +0000 (11:35 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours am:
af8e230787
am:
fe26fadf97
Change-Id: I5ee1baf2285f4efb000f8077377313d367325264
Paul Duffin [Tue, 27 Jun 2017 11:34:01 +0000 (11:34 +0000)]
Merge "Clean up Predicate related code in android.test" am:
1230b249f1 -s ours
am:
1cd40dac5c
Change-Id: Idde6b4548f44eefb5633ee88f1a497b72f7d7f42
Julius D'souza [Tue, 27 Jun 2017 11:30:00 +0000 (11:30 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: I26adc1561e90d9eeca58bb130c2c137e6fea9f40
Julius D'souza [Tue, 27 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours am:
8af046a55e -s ours
am:
af8e230787
Change-Id: Ifc935d4b6a9f8eccf26882130ef994288ea23e64
Paul Duffin [Tue, 27 Jun 2017 11:27:41 +0000 (11:27 +0000)]
Merge "Clean up Predicate related code in android.test"
am:
1230b249f1 -s ours
Change-Id: I4836793deccd83e06129ad18035f4f4acf5f8617
Julius D'souza [Tue, 27 Jun 2017 11:25:01 +0000 (11:25 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev am:
fef074ad29 -s ours
am:
8af046a55e -s ours
Change-Id: I6535c07aaf3a62db028da439ead2172c756ef63f
Julius D'souza [Tue, 27 Jun 2017 11:19:01 +0000 (11:19 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
am:
fef074ad29 -s ours
Change-Id: I9e6702dc1e7f9dd875f39cfa61bccdb9dfe117a1
Julius D'souza [Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)]
Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding purposes in order to determine power usage. However, this feature has since been moved to the G release." into cw-f-dev
Paul Duffin [Tue, 27 Jun 2017 11:03:11 +0000 (11:03 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3 am:
1c6a5ad92e
am:
88d54c3080
Change-Id: I3716fc728a6789a33851f4f0ad30a3ad9f421a17
Paul Duffin [Tue, 27 Jun 2017 10:57:34 +0000 (10:57 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3
am:
1c6a5ad92e
Change-Id: I5f24e0e8a5b4c592e60e749df66df3908d1620f5
Paul Duffin [Tue, 27 Jun 2017 10:52:39 +0000 (10:52 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
am:
8c7026c5a3
Change-Id: I503ae16c4d47ce3cecb79987da919c7f579347da
Paul Duffin [Tue, 27 Jun 2017 10:42:56 +0000 (10:42 +0000)]
Merge "Clean up Predicate related code in android.test"
Paul Duffin [Tue, 27 Jun 2017 10:42:51 +0000 (10:42 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
Kenny Guy [Mon, 26 Jun 2017 18:13:56 +0000 (19:13 +0100)]
Fix deadlock in NetworkLoggingHandler
Stop NetworkLoggingHandler holding a lock
when calling back into DevicePolicyManagerService.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithTwoUsers
Bug:
62966480
Change-Id: I41c3edca8922008a9d838d71ddcc50883699bc74
Android Build Merger (Role) [Tue, 27 Jun 2017 10:06:27 +0000 (10:06 +0000)]
Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
656c1105f6" into oc-dr1-dev-plus-aosp
Selim Cinek [Tue, 27 Jun 2017 10:05:26 +0000 (10:05 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40
am:
656c1105f6
Change-Id: I1102ed0d33c2497b069e2285f097f6bfbe8b5685
Selim Cinek [Tue, 27 Jun 2017 10:05:25 +0000 (10:05 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40
am:
1d9c84b39b
Change-Id: Ia7b2b47db9368348d5a7319f67944fb421cc00d5
Selim Cinek [Tue, 27 Jun 2017 10:00:35 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ifba5dcd771b7156f9e12bb1a2b9311241850ba8c
Selim Cinek [Tue, 27 Jun 2017 10:00:34 +0000 (10:00 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
am:
06fdcf8a40
Change-Id: Ife4c2d8eb5a7146a46b8cc8d088442b5e0790949
TreeHugger Robot [Tue, 27 Jun 2017 09:54:20 +0000 (09:54 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev
Android Build Merger (Role) [Tue, 27 Jun 2017 04:28:04 +0000 (04:28 +0000)]
Merge "Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
0259473b75" into oc-dr1-dev-plus-aosp
Bryce Lee [Tue, 27 Jun 2017 04:27:08 +0000 (04:27 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae
am:
943794bb70
Change-Id: I9bf7aa7a5b1e8fbf7ccdea5a883c0ce98fa8f3ff
Bryce Lee [Tue, 27 Jun 2017 04:27:05 +0000 (04:27 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae
am:
0259473b75
Change-Id: I3d42c1c1136740c1f89608391141ac5f35f1fce8
Bryce Lee [Tue, 27 Jun 2017 04:20:35 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I849ea5bfce87bd6a9264308e40242f6a2026713c
Bryce Lee [Tue, 27 Jun 2017 04:20:34 +0000 (04:20 +0000)]
Merge "Add aborted start result." into oc-dev
am:
8796c20dae
Change-Id: I893c429db5c71747fda8e390ee7d9d786ce0c53a
Bryce Lee [Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)]
Merge "Add aborted start result." into oc-dev
Chris Craik [Tue, 27 Jun 2017 02:04:04 +0000 (02:04 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
am:
049543b771
Change-Id: I10712da29d0c84d2aa462bf892857e27c73f273b
TreeHugger Robot [Tue, 27 Jun 2017 01:59:24 +0000 (01:59 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 01:30:00 +0000 (01:30 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev
am:
aef55ec08b
Change-Id: If0cfd58dcd93a2b4d0f128cfcfcff7cac451ea35
Shishir Agrawal [Tue, 27 Jun 2017 01:23:07 +0000 (01:23 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev
Jeff Davidson [Tue, 27 Jun 2017 00:53:58 +0000 (00:53 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
am:
776220d029
Change-Id: I9896d70fea9d69025c1a77d634333d160a71acb6
TreeHugger Robot [Tue, 27 Jun 2017 00:48:33 +0000 (00:48 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
Zak Cohen [Tue, 27 Jun 2017 00:22:45 +0000 (17:22 -0700)]
Don't assume device has on screen nav bar in RoundedCorners service.
Bug:
63039412
Test: manual
Change-Id: I9af3e1fb9d831dfb988c88b8ef78a52f2af4bef0
Makoto Onuki [Mon, 26 Jun 2017 23:53:00 +0000 (23:53 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
am:
c4ccefc7fd
Change-Id: I2701f1fc12d487d23200ef8e5509535656fe27fe
TreeHugger Robot [Mon, 26 Jun 2017 23:49:00 +0000 (23:49 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
Android Build Merger (Role) [Mon, 26 Jun 2017 23:37:58 +0000 (23:37 +0000)]
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
36520c229f" into oc-dr1-dev-plus-aosp
Makoto Onuki [Mon, 26 Jun 2017 23:36:54 +0000 (23:36 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b
am:
36520c229f
Change-Id: I1cea2e7016ec5a1bf3b3411d7cbb389db150aeef
Makoto Onuki [Mon, 26 Jun 2017 23:36:48 +0000 (23:36 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b
am:
eb63919bc4
Change-Id: Ie035bcafa71e4b8d2e2e839212b001dc4c1d00f7
Makoto Onuki [Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
Makoto Onuki [Mon, 26 Jun 2017 23:31:56 +0000 (23:31 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am:
9f607f4c0b
Change-Id: Iddf617784c20bfd835413e934071aea3b02d5d6c
Bryce Lee [Mon, 26 Jun 2017 23:27:32 +0000 (16:27 -0700)]
Add aborted start result.
Previously, we were returning START_SUCCESS when ActivityStarter
aborted launching the activity. This hides this activity and makes it
harder to debug.
This CL adds a new start result type to capture this internally.
Bug:
38121026
Test: manual
Test: go/wm-smoke
Change-Id: I97699b22b1eff476724c48db0c29daa0566ad280
TreeHugger Robot [Mon, 26 Jun 2017 23:25:10 +0000 (23:25 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
Ying Xu [Mon, 26 Jun 2017 23:15:58 +0000 (23:15 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev
am:
231e291b06 -s ours
Change-Id: I5faaa2f7589ceaa68bf7ae21c065e2dce0621286
Ying Xu [Mon, 26 Jun 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev
Sean Lu [Mon, 26 Jun 2017 23:09:29 +0000 (23:09 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce am:
516bd5f862
am:
2d604852ce
Change-Id: I983ab5312b484a8d3f8adafd693f2435c460ab5a
Sean Lu [Mon, 26 Jun 2017 23:04:56 +0000 (23:04 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce
am:
516bd5f862
Change-Id: I8334cb07c4cc3479e91381cb7d6be3a08b746070
Sean Lu [Mon, 26 Jun 2017 22:59:35 +0000 (22:59 +0000)]
Merge "[Resources] house keeping in TypeList"
am:
ff2e03cfce
Change-Id: I22b0a87776d794f23f70f2f9d8d885761c0b8d14
Marco Nelissen [Mon, 26 Jun 2017 22:53:04 +0000 (22:53 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
am:
59a66b8601
Change-Id: I1e8e369079b649890e3313ef406c97f3ea86c0f0
Treehugger Robot [Mon, 26 Jun 2017 22:50:23 +0000 (22:50 +0000)]
Merge "[Resources] house keeping in TypeList"
TreeHugger Robot [Mon, 26 Jun 2017 22:48:00 +0000 (22:48 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev
Evan Laird [Mon, 26 Jun 2017 22:16:54 +0000 (22:16 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
am:
be196018e1
Change-Id: Ib7f8e5e65b353bf03affc557e38d7c4ecd47d0a8
TreeHugger Robot [Mon, 26 Jun 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
Chris Craik [Mon, 26 Jun 2017 21:03:01 +0000 (14:03 -0700)]
Use NativeAllocationRegistry for ColorFilter
Bug:
62994689
Test: bit CtsGraphicsTestCases:*
Change-Id: Icea01fa7d4c6e78f3a93434de64bc8ddfe0c7a0e
Android Build Merger (Role) [Mon, 26 Jun 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev am:
5345fce58f" into oc-dr1-dev-plus-aosp
Bryce Lee [Mon, 26 Jun 2017 21:17:29 +0000 (21:17 +0000)]
Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev
am:
5345fce58f
Change-Id: I3b70dbc2fcdac06b83948fc7dfed82a5872028d7
Android Build Merger (Role) [Mon, 26 Jun 2017 21:16:49 +0000 (21:16 +0000)]
Merge "Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev am:
c4e8720eb2" into oc-dr1-dev-plus-aosp
Makoto Onuki [Mon, 26 Jun 2017 21:15:26 +0000 (21:15 +0000)]
Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
am:
c4e8720eb2
Change-Id: Ib24297e8ca16f1f9db5f6951438f4f7006e545c7
Bryce Lee [Mon, 26 Jun 2017 21:15:25 +0000 (21:15 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f
am:
4e9f527d17
Change-Id: I891215b6bd198ded78af491e9a69e71ffbb5d805
Android Build Merger (Role) [Mon, 26 Jun 2017 20:59:50 +0000 (20:59 +0000)]
Merge "Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:59:00 +0000 (20:59 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I7f11b4a66def7cb49ba20a4ab4772eea0a25ef16
Bryce Lee [Mon, 26 Jun 2017 20:58:56 +0000 (20:58 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
am:
61196fef1f
Change-Id: I1ead0fd55eb35fd69a4c8e3de5a1449ce296edd9
TreeHugger Robot [Mon, 26 Jun 2017 20:58:23 +0000 (20:58 +0000)]
Merge "Log sync details to rotating log files (userdebug/eng only)" into oc-dr1-dev
Bryce Lee [Mon, 26 Jun 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:51 +0000 (20:26 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
a350db60bd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 26 Jun 2017 20:26:32 +0000 (20:26 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
ae524ac5fa" into oc-dr1-dev-plus-aosp
Todd Kennedy [Mon, 26 Jun 2017 20:25:53 +0000 (20:25 +0000)]
Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160
am:
a350db60bd
Change-Id: Ic1ee7426adb727cbe9ea208a367e57f8d1ed3514
Todd Kennedy [Mon, 26 Jun 2017 20:25:35 +0000 (20:25 +0000)]
Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160
am:
ae524ac5fa
Change-Id: I4d858aec3c61899f150e1a48571d142075549654
Android Build Merger (Role) [Mon, 26 Jun 2017 20:25:25 +0000 (20:25 +0000)]
Merge "Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417 am:
a86cc7098a" into oc-dr1-dev-plus-aosp
Jason Monk [Mon, 26 Jun 2017 20:24:28 +0000 (20:24 +0000)]
Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417
am:
a86cc7098a
Change-Id: I120be1f1bda0b853fa308d996465ed9e9abfd441
Jason Monk [Mon, 26 Jun 2017 20:24:20 +0000 (20:24 +0000)]
Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417
am:
be163c055e
Change-Id: Ib65d556f261990aae6f4d93e2198c5909cf11733
Todd Kennedy [Mon, 26 Jun 2017 20:13:57 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f
Todd Kennedy [Mon, 26 Jun 2017 20:13:41 +0000 (20:13 +0000)]
Merge "Filter instant apps with different names" into oc-dev
am:
adcc94f160
Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2
Jason Monk [Mon, 26 Jun 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca
Jason Monk [Mon, 26 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
am:
aa2286e417
Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f
TreeHugger Robot [Mon, 26 Jun 2017 20:06:19 +0000 (20:06 +0000)]
Merge "Filter instant apps with different names" into oc-dev
TreeHugger Robot [Mon, 26 Jun 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Fix QS lock screen animation" into oc-dev
Lucas Dupin [Mon, 26 Jun 2017 19:46:19 +0000 (19:46 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev
am:
56a1a7d331
Change-Id: I6534542a2ff3c2147ac20c4e3cef841483e86b20
Christine Franks [Mon, 26 Jun 2017 19:41:24 +0000 (19:41 +0000)]
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
am:
ca4def2ac8
Change-Id: I9b847d08144f484bb68a293c0be258fb52fdeb92
TreeHugger Robot [Mon, 26 Jun 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev
Christine Franks [Mon, 26 Jun 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Add ACTION_DISMISS_TIMER intent" into oc-dr1-dev
Pankaj Kanwar [Mon, 26 Jun 2017 18:30:11 +0000 (18:30 +0000)]
Merge "Fix the red build." into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 26 Jun 2017 18:29:42 +0000 (18:29 +0000)]
Merge "Merge "Fix TimePicker RTL issues" into oc-dev am:
7b95c932d6 am:
32974e0705" into oc-dr1-dev-plus-aosp
OSDN Git Service
