OSDN Git Service
Paul Duffin [Tue, 27 Jun 2017 11:09:09 +0000 (11:09 +0000)]
Merge "Clean up ClassPathPackageInfoSource" am:
8c7026c5a3 am:
1c6a5ad92e am:
88d54c3080
am:
06620ee22d
Change-Id: I1a4de01fe23a03b42c052f23733d95e07135ab73
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:51 +0000 (10:42 +0000)]
Merge "Clean up ClassPathPackageInfoSource"
Pavel Grafov [Tue, 27 Jun 2017 10:28:02 +0000 (10:28 +0000)]
Merge "Add credential verification command to locksetting."
Selim Cinek [Tue, 27 Jun 2017 10:11:56 +0000 (10:11 +0000)]
Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
656c1105f6" into oc-dr1-dev-plus-aosp
am:
0ee8c0357a
Change-Id: I28ab82aa34e3e401748c1ce9874c394c0fc75633
Selim Cinek [Tue, 27 Jun 2017 10:10:29 +0000 (10:10 +0000)]
Merge "Fixed an accessibility issue with the pin view" into oc-dev am:
06fdcf8a40 am:
1d9c84b39b
am:
dddc362bc9
Change-Id: Ie5ca3300ff77bb925c62bba109eda8d839398c22
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
Bryce Lee [Tue, 27 Jun 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
0259473b75" into oc-dr1-dev-plus-aosp
am:
57668dee77
Change-Id: I982363bf6dab1b9d8653ab2a80367d40d024639b
Bryce Lee [Tue, 27 Jun 2017 04:31:39 +0000 (04:31 +0000)]
Merge "Add aborted start result." into oc-dev am:
8796c20dae am:
943794bb70
am:
ee289616fb
Change-Id: I1b69a9fb813e2cab1a3c8b496ea5b753cdf3abe6
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:08:00 +0000 (02:08 +0000)]
Merge "Use NativeAllocationRegistry for ColorFilter" into oc-dr1-dev am:
049543b771
am:
bc1db397eb
Change-Id: I76e107bbbb89e32f535324f393c8f4ad3341bed3
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:34:30 +0000 (01:34 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dr1-dev am:
aef55ec08b
am:
0dfc48490d
Change-Id: Ief4f6d258163ddd69d0cf9799c6118d5979fbf59
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 01:00:05 +0000 (01:00 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev am:
776220d029
am:
f60773b22d
Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57
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:50:51 +0000 (00:50 +0000)]
Merge "Fixed focus navigation on bugreport dialog."
TreeHugger Robot [Tue, 27 Jun 2017 00:48:33 +0000 (00:48 +0000)]
Merge "Pass calling package to resolution UI." into oc-dr1-dev
Phil Weaver [Tue, 27 Jun 2017 00:39:23 +0000 (00:39 +0000)]
Merge "Clean up popup window titles"
Makoto Onuki [Tue, 27 Jun 2017 00:38:12 +0000 (00:38 +0000)]
Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev am:
c4ccefc7fd
am:
bb55e3e2e4
Change-Id: I98a0ff03f1de40e3092da47eaae2a3febfe1bd60
Makoto Onuki [Tue, 27 Jun 2017 00:36:56 +0000 (00:36 +0000)]
Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
36520c229f" into oc-dr1-dev-plus-aosp
am:
bd1d8bf4c2
Change-Id: I770e8c209a9885685c1415cbb4a3c6a2ccb37e44
Makoto Onuki [Tue, 27 Jun 2017 00:35:31 +0000 (00:35 +0000)]
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am:
9f607f4c0b am:
eb63919bc4
am:
9b723d886e
Change-Id: If824cafb12f37555fc433512d1fd02ab107f4355
Ying Xu [Tue, 27 Jun 2017 00:34:09 +0000 (00:34 +0000)]
Merge "Fix the inconsistency of scan status." into oc-dr1-dev am:
231e291b06 -s ours
am:
cb758f46ba -s ours
Change-Id: I8237389f9e1bd2223f488ae642500bc664704c23
Sean Lu [Tue, 27 Jun 2017 00:33:00 +0000 (00:33 +0000)]
Merge "[Resources] house keeping in TypeList" am:
ff2e03cfce am:
516bd5f862 am:
2d604852ce
am:
5386fcf965
Change-Id: Iafa12b6189d9b97354adcff2a481602db9522c48
Marco Nelissen [Tue, 27 Jun 2017 00:31:33 +0000 (00:31 +0000)]
Merge "Revert "Multiple worker threads for SoundPool"" into oc-dr1-dev am:
59a66b8601
am:
b0bb373286
Change-Id: I859b99e3dc68396abccc0f399004860042d6cb07
Evan Laird [Tue, 27 Jun 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev am:
be196018e1
am:
fdef07d9fe
Change-Id: I8d8b1f126ed3a7690cc09d9fc38f12583210b407
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
Phil Weaver [Fri, 16 Jun 2017 22:50:16 +0000 (15:50 -0700)]
Clean up popup window titles
Removing the recently-added APIs to adjust the title for
the popup window, and moving setting the title to
preparePopup(), which is guaranteed to have a context.
(The bug is a crash because we didn't have a context.)
Apps wishing to specify their own title can still do so
in the LayoutParams without bothering with the get/set.
Bug:
62675086
Test: With TalkBack running, navigate to Settings->
Network & Internet. Select the more options button and
double-tap to select it. It now announces "Popup Window".
Change-Id: I9735ace42c24ef4977d3f4d5150f768d44aff351
TreeHugger Robot [Mon, 26 Jun 2017 22:26:09 +0000 (22:26 +0000)]
Merge "Implement key/value quota-overrun detection in LocalTransport"
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
Felipe Leme [Mon, 26 Jun 2017 21:58:22 +0000 (14:58 -0700)]
Fixed focus navigation on bugreport dialog.
Test: manual verification with bluetooth keyboard
Test: not ran unit tests because they're currently broken.
Fixes:
62872207
Change-Id: I2a42153d04deadde65b2778457b91189d4af511f
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
Bryce Lee [Mon, 26 Jun 2017 21:26:54 +0000 (21:26 +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
am:
519ce1487c
Change-Id: I46846b894e332431cf793657cad4903bfadd418f
Makoto Onuki [Mon, 26 Jun 2017 21:25:30 +0000 (21:25 +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
am:
54805b7467
Change-Id: I8e6c29906a3d5f8814a89ad419146e5b8eff9e4c
Bryce Lee [Mon, 26 Jun 2017 21:24:02 +0000 (21:24 +0000)]
Merge "Revert "Add ActivityInfo logging."" into oc-dev am:
61196fef1f am:
4e9f527d17
am:
1ffc7ca2d7
Change-Id: I5fcc8de81415a72b1733892b37712b1fe1ea287f
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
TreeHugger Robot [Mon, 26 Jun 2017 21:07:28 +0000 (21:07 +0000)]
Merge "Fix metrics constant typo"
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
Tomasz Wasilczyk [Mon, 26 Jun 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Remove previous implementation of RadioService."
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
Todd Kennedy [Mon, 26 Jun 2017 20:43:02 +0000 (20:43 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
a350db60bd" into oc-dr1-dev-plus-aosp
am:
fdacdca831
Change-Id: I23097276d01509f42b71e9a7dcc1e66d33a4f5ab
Todd Kennedy [Mon, 26 Jun 2017 20:41:29 +0000 (20:41 +0000)]
Merge "Merge "Filter instant apps with different names" into oc-dev am:
adcc94f160 am:
ae524ac5fa" into oc-dr1-dev-plus-aosp
am:
193a4f12c5
Change-Id: I4f8fe31455f5946477d8a793843e70d0f88d17eb
Jason Monk [Mon, 26 Jun 2017 20:39:55 +0000 (20:39 +0000)]
Merge "Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417 am:
a86cc7098a" into oc-dr1-dev-plus-aosp
am:
29532b40c7
Change-Id: I36db47a9d2b3c7924e80eb980f2eaa6a33ecfd46
Jason Monk [Mon, 26 Jun 2017 20:38:29 +0000 (20:38 +0000)]
Merge "Fix QS lock screen animation" into oc-dev am:
aa2286e417 am:
be163c055e
am:
d7464478ee
Change-Id: I7383890619c9696de358efd4099c7af5b223a5f3
Christopher Tate [Fri, 23 Jun 2017 19:48:26 +0000 (12:48 -0700)]
Implement key/value quota-overrun detection in LocalTransport
We now preflight the effect of a k/v backup delta set against the
current contents of the datastore, so we can detect and report a
quota overrun nondestructively.
Test: bit CtsBackupTestCases:.KeyValueQuotaTest
Change-Id: If69687b891271d7bbb46c3a66728b716dc51fc39
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
TreeHugger Robot [Mon, 26 Jun 2017 20:19:45 +0000 (20:19 +0000)]
Merge "Only try to autogroup if group info changes"
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
TreeHugger Robot [Mon, 26 Jun 2017 20:12:48 +0000 (20:12 +0000)]
Merge "Added boot time metrics for systemui"
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:53:43 +0000 (19:53 +0000)]
Merge "Add missing ints to palette" into oc-dr1-dev am:
56a1a7d331
am:
b3c27864c7
Change-Id: I7103c9a40a3ea3fcf91d914bb8b41d80612f61ff
OSDN Git Service
