OSDN Git Service
Android Build Merger (Role) [Thu, 16 Jun 2016 21:42:34 +0000 (21:42 +0000)]
Merge "Merge \\"Don\\'t re-launch activities while the device is sleeping\\" into nyc-dev am:
f6e3c9a553 am:
4e9c615769" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 16 Jun 2016 21:42:28 +0000 (21:42 +0000)]
Merge "Merge \\"Bring task to front when we can\\'t move to adjacent stack\\" into nyc-dev am:
320c15e1b2 am:
ddfeb4a6c2" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Thu, 16 Jun 2016 21:41:56 +0000 (21:41 +0000)]
Merge \\"Don\\'t re-launch activities while the device is sleeping\\" into nyc-dev am:
f6e3c9a553
am:
4e9c615769
Change-Id: I3f3fac134443a475138d279153fd6eccf1b20d9b
Andrii Kulian [Thu, 16 Jun 2016 21:41:56 +0000 (21:41 +0000)]
Merge \\"Bring task to front when we can\\'t move to adjacent stack\\" into nyc-dev am:
320c15e1b2
am:
ddfeb4a6c2
Change-Id: Id50b05f5d9c8b1aeb8534b5701a9444a525e574a
Andrii Kulian [Thu, 16 Jun 2016 21:41:55 +0000 (21:41 +0000)]
Merge \\"Bring task to front when we can\\'t move to adjacent stack\\" into nyc-dev am:
320c15e1b2
am:
8b7544fad7
Change-Id: Idc400546873b3eba63984406aa9dad04d34a03c8
Wale Ogunwale [Thu, 16 Jun 2016 21:36:22 +0000 (21:36 +0000)]
Merge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev
am:
f6e3c9a553
Change-Id: Ib69f5adf861c011e7f5149287e87fec1431eb3e0
Andrii Kulian [Thu, 16 Jun 2016 21:36:22 +0000 (21:36 +0000)]
Merge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev
am:
320c15e1b2
Change-Id: Ia0732370e4952d5cbecfb4ed86150eba090fbb49
Andrii Kulian [Thu, 16 Jun 2016 21:36:18 +0000 (21:36 +0000)]
Merge \"Bring task to front when we can\'t move to adjacent stack\" into nyc-dev
am:
320c15e1b2
Change-Id: I6e4ca3affec4c42e2e345360c75f3a10acb26272
TreeHugger Robot [Thu, 16 Jun 2016 21:32:26 +0000 (21:32 +0000)]
Merge "Don't re-launch activities while the device is sleeping" into nyc-dev
Andrii Kulian [Thu, 16 Jun 2016 21:30:21 +0000 (21:30 +0000)]
Merge "Bring task to front when we can't move to adjacent stack" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 21:28:43 +0000 (21:28 +0000)]
Merge "Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am:
f33af2285b am:
599cf6bc4a" into nyc-mr1-dev-plus-aosp
Yorke Lee [Thu, 16 Jun 2016 21:28:03 +0000 (21:28 +0000)]
Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am:
f33af2285b
am:
599cf6bc4a
Change-Id: Ic4137c9b35363bfd014befc7c85958e89890b441
Yorke Lee [Thu, 16 Jun 2016 21:27:50 +0000 (21:27 +0000)]
Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am:
f33af2285b
am:
3d80871032
Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912
Yorke Lee [Thu, 16 Jun 2016 21:22:22 +0000 (21:22 +0000)]
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am:
f33af2285b
Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
Yorke Lee [Thu, 16 Jun 2016 21:21:57 +0000 (21:21 +0000)]
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am:
f33af2285b
Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc
Yorke Lee [Thu, 16 Jun 2016 21:16:11 +0000 (21:16 +0000)]
Merge "Limit global drags to apps targeting SDK 24 and above" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 21:13:48 +0000 (21:13 +0000)]
Merge "Merge \\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\" into nyc-dev am:
d06520a488 am:
0bae4dcd76" into nyc-mr1-dev-plus-aosp
Gina Dimino [Thu, 16 Jun 2016 21:13:12 +0000 (21:13 +0000)]
Merge \\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\" into nyc-dev am:
d06520a488
am:
0bae4dcd76
Change-Id: I33602c0fdccc84b741bd8ce0bbeb5bf50fcd26cb
Gina Dimino [Thu, 16 Jun 2016 21:13:04 +0000 (21:13 +0000)]
Merge \\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\" into nyc-dev am:
d06520a488
am:
b7181150c4
Change-Id: Iaa27ea956dbb521ff0fd20c2ab4ddb27608bf2f4
Gina Dimino [Thu, 16 Jun 2016 21:08:17 +0000 (21:08 +0000)]
Merge \"Docs: Suppress errors in SystemApi Build Bug:
28427390\" into nyc-dev
am:
d06520a488
Change-Id: Ice3bd7016d11e4f8f50c09e7b6ba3cb613911a52
Gina Dimino [Thu, 16 Jun 2016 21:08:15 +0000 (21:08 +0000)]
Merge \"Docs: Suppress errors in SystemApi Build Bug:
28427390\" into nyc-dev
am:
d06520a488
Change-Id: I127501113d4e290a1e8d0b3a44ba779ec36cdc1d
Andreas Gampe [Thu, 16 Jun 2016 21:07:29 +0000 (21:07 +0000)]
Merge \\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into stage-aosp-master am:
e1cf90c6eb
am:
e8f9aa9d5d
Change-Id: I9bf2d81a53209a45d6bc644e421fd387fe23fb84
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am:
9f4ad4fbb6
am:
dd094522bd
Change-Id: Ie7f16b2fbf03fd1318c5c15bcfdb74ac9d33c503
Yi Kong [Thu, 16 Jun 2016 21:02:40 +0000 (21:02 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into stage-aosp-master
am:
e1cf90c6eb
Change-Id: Ib300b8d9ca4082abeebe3530c74537969330e1a7
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 21:02:39 +0000 (21:02 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am:
9f4ad4fbb6
Change-Id: I18db994066406214705f36f2e10f0d39dcc279df
Gina Dimino [Thu, 16 Jun 2016 21:02:13 +0000 (21:02 +0000)]
Merge "Docs: Suppress errors in SystemApi Build Bug:
28427390" into nyc-dev
Andreas Gampe [Thu, 16 Jun 2016 20:59:42 +0000 (20:59 +0000)]
Merge "Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92" into stage-aosp-master
Android Build Merger (Role) [Thu, 16 Jun 2016 20:58:12 +0000 (20:58 +0000)]
Merge "Merge \\"docs: Minor update to DP4 release notes\\" into nyc-dev am:
5a3a66a253 am:
e73adf38a7" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Thu, 16 Jun 2016 20:57:43 +0000 (20:57 +0000)]
Merge \\"docs: Minor update to DP4 release notes\\" into nyc-dev am:
5a3a66a253
am:
e73adf38a7
Change-Id: Ic96f081a04fcf3948df060d384f5ecebd4bd10a8
Andrew Solovay [Thu, 16 Jun 2016 20:57:36 +0000 (20:57 +0000)]
Merge \\"docs: Minor update to DP4 release notes\\" into nyc-dev am:
5a3a66a253
am:
0d21553bd2
Change-Id: Ibf68a54abc82bee9ee19eb19aad01fe4fe254855
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
(cherry picked from commit
ade5c7c8930969b50b6653ab28d87cccbd566547)
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Andrew Solovay [Thu, 16 Jun 2016 20:51:51 +0000 (20:51 +0000)]
Merge \"docs: Minor update to DP4 release notes\" into nyc-dev
am:
5a3a66a253
Change-Id: Ia2d95b95055115cc7c71333ded4a140d7873b15b
Andrew Solovay [Thu, 16 Jun 2016 20:51:48 +0000 (20:51 +0000)]
Merge \"docs: Minor update to DP4 release notes\" into nyc-dev
am:
5a3a66a253
Change-Id: I3c4b05f0fe24ddd88ce905429eaa9ed489db5f0a
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update
Bug:
28666126
(cherry picked from commit
aa021e854ef84f7a7aff109b5bec824190f9ebfa)
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
TreeHugger Robot [Thu, 16 Jun 2016 20:47:02 +0000 (20:47 +0000)]
Merge "docs: Minor update to DP4 release notes" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 20:13:43 +0000 (20:13 +0000)]
Merge "Merge \\"Report error correctly for the implementation of StreamInterface::GetData()\\" into nyc-dev am:
e09415344d am:
86c1dd5256" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 16 Jun 2016 20:13:31 +0000 (20:13 +0000)]
Merge "Merge \\"Fix unresponsive brightness slider after font size change\\" into nyc-dev am:
db81dd9d2e am:
6ed10f4ffa" into nyc-mr1-dev-plus-aosp
Yujie Qin [Thu, 16 Jun 2016 20:13:01 +0000 (20:13 +0000)]
Merge \\"Report error correctly for the implementation of StreamInterface::GetData()\\" into nyc-dev am:
e09415344d
am:
86c1dd5256
Change-Id: I54862699f37e54c9dacb8b9504b3c8fa8b403cc8
Adrian Roos [Thu, 16 Jun 2016 20:12:57 +0000 (20:12 +0000)]
Merge \\"Fix unresponsive brightness slider after font size change\\" into nyc-dev am:
db81dd9d2e
am:
6ed10f4ffa
Change-Id: I81baded0d686528d8e59d83ce324afef8a2567f7
Yujie Qin [Thu, 16 Jun 2016 20:12:51 +0000 (20:12 +0000)]
Merge \\"Report error correctly for the implementation of StreamInterface::GetData()\\" into nyc-dev am:
e09415344d
am:
d09b020ce5
Change-Id: Ia132f48672c60f9d658bd3d3d444714878f7ff5b
Adrian Roos [Thu, 16 Jun 2016 20:12:50 +0000 (20:12 +0000)]
Merge \\"Fix unresponsive brightness slider after font size change\\" into nyc-dev am:
db81dd9d2e
am:
ac52bbec1f
Change-Id: Iad5d76cbfc8c60083d5675a4262e6be8d93f5e89
Yujie Qin [Thu, 16 Jun 2016 20:05:17 +0000 (20:05 +0000)]
Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev
am:
e09415344d
Change-Id: Id85ebdb2541c6145da39cf20684f85728f2ba0b6
Adrian Roos [Thu, 16 Jun 2016 20:05:13 +0000 (20:05 +0000)]
Merge \"Fix unresponsive brightness slider after font size change\" into nyc-dev
am:
db81dd9d2e
Change-Id: If6af6f296d86ab8856e04ed1707bd61d58414d78
Yujie Qin [Thu, 16 Jun 2016 20:02:23 +0000 (20:02 +0000)]
Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev
am:
e09415344d
Change-Id: Iedf22e08c22fed4e903794a78fc13e1ca215f19a
Yujie Qin [Thu, 16 Jun 2016 19:48:18 +0000 (19:48 +0000)]
Merge "Report error correctly for the implementation of StreamInterface::GetData()" into nyc-dev
Wale Ogunwale [Thu, 16 Jun 2016 17:03:40 +0000 (10:03 -0700)]
Don't re-launch activities while the device is sleeping
- Don't ensure configuration for top running activity that is in the
stopped state if the configuration change while the device is sleeping
as we don't want to relaunch activities in this state.
- Don't make activities visible while the device is sleeping and the
activity isn't in voice interaction mode. Making it visible can also
lead to the activity been relaunched due to configuration changing.
Note the the right configuration will be applied to the activity the next
time we try to make it visible. The re-launch will happen then.
Bug:
28518380
Change-Id: Ic22193db645dec358065cb05e7f1afc6fc8ac49f
Adrian Roos [Thu, 16 Jun 2016 19:29:32 +0000 (19:29 +0000)]
Merge \"Fix unresponsive brightness slider after font size change\" into nyc-dev
am:
db81dd9d2e
Change-Id: Ib507eb86306687928dc775945e033b2bcfb17ad3
Adrian Roos [Thu, 16 Jun 2016 19:25:47 +0000 (19:25 +0000)]
Merge "Fix unresponsive brightness slider after font size change" into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 19:24:14 +0000 (19:24 +0000)]
Merge "Merge \\"Include cause when reporting errors.\\" into nyc-dev am:
60585e6c54 am:
ba7fc3b35f" into nyc-mr1-dev-plus-aosp
Steve McKay [Thu, 16 Jun 2016 19:23:50 +0000 (19:23 +0000)]
Merge \\"Include cause when reporting errors.\\" into nyc-dev am:
60585e6c54
am:
ba7fc3b35f
Change-Id: Ia6cbd90cbc5cca915d1c89a64cc2ca006ce9369c
Steve McKay [Thu, 16 Jun 2016 19:23:07 +0000 (19:23 +0000)]
Merge \\"Include cause when reporting errors.\\" into nyc-dev am:
60585e6c54
am:
be8b6e6164
Change-Id: Id636e7d4e803aafc1aae768e09e9d79cba7522ed
Steve McKay [Thu, 16 Jun 2016 19:18:45 +0000 (19:18 +0000)]
Merge \"Include cause when reporting errors.\" into nyc-dev
am:
60585e6c54
Change-Id: I014009e3c8e8b167b3d322886cadc20f2d9f6eaf
Steve McKay [Thu, 16 Jun 2016 19:18:28 +0000 (19:18 +0000)]
Merge \"Include cause when reporting errors.\" into nyc-dev
am:
60585e6c54
Change-Id: I9a0ba14d358fedd7287e4bd0c5710953a9f21d27
TreeHugger Robot [Thu, 16 Jun 2016 19:14:04 +0000 (19:14 +0000)]
Merge "Include cause when reporting errors." into nyc-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am:
47c3afa10b am:
f2326e947c" into nyc-mr1-dev-plus-aosp
Felipe Leme [Thu, 16 Jun 2016 18:58:08 +0000 (18:58 +0000)]
Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am:
47c3afa10b
am:
f2326e947c
Change-Id: I9bbf3df043b5a62823a4a1a50a1dc47a1970cbd3
Felipe Leme [Thu, 16 Jun 2016 18:57:30 +0000 (18:57 +0000)]
Merge \\"Check extra type before blindingly casting to Parcelable.\\" into nyc-dev am:
47c3afa10b
am:
9b36b6d3d8
Change-Id: I24fc920fc54e4fd5865bc4b77d78b5c4ce919052
Felipe Leme [Thu, 16 Jun 2016 18:53:47 +0000 (18:53 +0000)]
Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am:
47c3afa10b
Change-Id: I4cb74a467a10ee3d38db91fde077263179bf9359
Felipe Leme [Thu, 16 Jun 2016 18:52:50 +0000 (18:52 +0000)]
Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am:
47c3afa10b
Change-Id: I60c54353bdbd57818bcf5bcc47d55328d46ce6b9
Dianne Hackborn [Thu, 16 Jun 2016 18:49:47 +0000 (18:49 +0000)]
Merge \"Merge \\"Fix issue #
29371078: Foreground jobs should not count...\\" into nyc-dev am:
47cfac6803\" into nyc-mr1-dev
am:
ab84ab5f35
Change-Id: I548579a05c05a01df05c6fbfb82315e53d90bd78
Michael Kwan [Thu, 16 Jun 2016 18:49:44 +0000 (18:49 +0000)]
Merge \"Add better configurability for dialog theme colours.\" into nyc-mr1-dev
am:
c637d4bde2
Change-Id: If2fe85982fd704d501d7dfb61494ea088b79c6c2
TreeHugger Robot [Thu, 16 Jun 2016 18:47:50 +0000 (18:47 +0000)]
Merge "Check extra type before blindingly casting to Parcelable." into nyc-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:46:43 +0000 (18:46 +0000)]
Merge \\"Fix issue #
29371078: Foreground jobs should not count...\\" into nyc-dev am:
47cfac6803
am:
403e103eb2
Change-Id: Ief9539ea61813129a9aa2f122178e084ebd5a010
Android Build Merger (Role) [Thu, 16 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "Merge \"Fix issue #
29371078: Foreground jobs should not count...\" into nyc-dev am:
47cfac6803" into nyc-mr1-dev
Michael Kwan [Thu, 16 Jun 2016 18:44:13 +0000 (18:44 +0000)]
Merge "Add better configurability for dialog theme colours." into nyc-mr1-dev
Dianne Hackborn [Thu, 16 Jun 2016 18:43:57 +0000 (18:43 +0000)]
Merge \"Fix issue #
29371078: Foreground jobs should not count...\" into nyc-dev
am:
47cfac6803
Change-Id: I94a6674bcb0327bc55fbfc1d18c4a5d6d723a52e
Dianne Hackborn [Thu, 16 Jun 2016 18:43:37 +0000 (18:43 +0000)]
Merge \"Fix issue #
29371078: Foreground jobs should not count...\" into nyc-dev
am:
47cfac6803
Change-Id: I1de87ba1e5d14f5f9bd66cde733517e3fc5e71f3
Dianne Hackborn [Thu, 16 Jun 2016 18:39:02 +0000 (18:39 +0000)]
Merge "Fix issue #
29371078: Foreground jobs should not count..." into nyc-dev
Andrii Kulian [Wed, 15 Jun 2016 22:27:01 +0000 (15:27 -0700)]
Bring task to front when we can't move to adjacent stack
If task was requested to move to adjacent stack with mLaunchStackId set
and FLAG_ACTIVITY_LAUNCH_ADJACENT not set - we don't move it from its
current stack. If the task was covered with other task(s) it wouldn't
be brought to front.
This CL checks if mLaunchStackId is provided and is a valid stack for this
task, then we move it to front of current stack as a safer option.
Bug:
29103549
Change-Id: I3065960f082cfbf9a5b43c6e83b5cebe3dd69df6
Andrew Solovay [Thu, 16 Jun 2016 00:32:42 +0000 (17:32 -0700)]
docs: Minor update to DP4 release notes
Added a new section from Dirk, with a couple of gotchas for people
updating from API level ≤22 to 24.
See first comment for doc stage location.
Change-Id: I237e9efac75b9c1e0fbeecf362dbc0de7c958c60
Android Build Merger (Role) [Thu, 16 Jun 2016 17:53:59 +0000 (17:53 +0000)]
Merge "Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am:
e25c8532b6 am:
4a352d2c41" into nyc-mr1-dev-plus-aosp
Gustav Sennton [Thu, 16 Jun 2016 17:53:35 +0000 (17:53 +0000)]
Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am:
e25c8532b6
am:
4a352d2c41
Change-Id: Ib71525eb35c9e4f125e679fce9c453fb349016e6
Gustav Sennton [Thu, 16 Jun 2016 17:53:03 +0000 (17:53 +0000)]
Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am:
e25c8532b6
am:
939f8caec2
Change-Id: If40694c4a8ca87fe5467374abfc1f6de867d8733
Gustav Sennton [Thu, 16 Jun 2016 17:47:21 +0000 (17:47 +0000)]
Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev
am:
e25c8532b6
Change-Id: Idf2b200364c7b760f82f5138b7aba0bd63bcf12b
Gustav Sennton [Thu, 16 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev
am:
e25c8532b6
Change-Id: Ie9f405765c146d21f1399037dd236d440902f0f9
Steve McKay [Tue, 14 Jun 2016 22:56:50 +0000 (15:56 -0700)]
Include cause when reporting errors.
Bug:
29191892
Change-Id: I5f904da3a8564ec68ca634c28e3eda7f496a5c1c
Gustav Sennton [Thu, 16 Jun 2016 17:40:08 +0000 (17:40 +0000)]
Merge "Support using uninstalled WebView packages as WebView implementation." into nyc-dev
Felipe Leme [Thu, 16 Jun 2016 17:02:38 +0000 (10:02 -0700)]
Check extra type before blindingly casting to Parcelable.
BUG:
29402928
Change-Id: If1729b8a4fcde724372b0a23cfae723a5d9b4faa
Yi Kong [Thu, 16 Jun 2016 17:14:43 +0000 (17:14 +0000)]
Merge \\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" am:
1850851670 am:
f5bdd8eae6
am:
b72fa52282
Change-Id: I512681e5a601e5d1e36979afef1fa3c443b2222c
Makoto Onuki [Thu, 16 Jun 2016 17:10:42 +0000 (17:10 +0000)]
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am:
489bafbb4b
Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39
Yi Kong [Thu, 16 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge \\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am:
1850851670
am:
f5bdd8eae6
Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380
Dan Willemsen [Thu, 16 Jun 2016 17:07:15 +0000 (17:07 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master am:
5f551b3fdc
am:
fd1854cdfa
Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
Yi Kong [Thu, 16 Jun 2016 17:02:37 +0000 (17:02 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
am:
1850851670
Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
Dan Willemsen [Thu, 16 Jun 2016 17:01:55 +0000 (17:01 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
am:
5f551b3fdc
Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
Dan Willemsen [Thu, 16 Jun 2016 16:54:28 +0000 (09:54 -0700)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
Mahaver Chopra [Thu, 16 Jun 2016 16:53:43 +0000 (16:53 +0000)]
Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev
am:
186768150f
Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
Mahaver Chopra [Thu, 16 Jun 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 16:38:10 +0000 (16:38 +0000)]
Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83 am:
092d961367" into nyc-mr1-dev-plus-aosp
Todd Kennedy [Thu, 16 Jun 2016 16:37:44 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
092d961367
Change-Id: Ifbea2336bcb5a38ec71147e905a593b8b3f55416
Todd Kennedy [Thu, 16 Jun 2016 16:37:23 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
e084a08ff5
Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d
Yorke Lee [Wed, 15 Jun 2016 17:03:18 +0000 (10:03 -0700)]
Limit global drags to apps targeting SDK 24 and above
Bug:
29127791
Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
Todd Kennedy [Thu, 16 Jun 2016 16:34:34 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
Todd Kennedy [Thu, 16 Jun 2016 16:34:11 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a
Todd Kennedy [Thu, 16 Jun 2016 16:22:53 +0000 (16:22 +0000)]
Merge "Make sure we're locked" into nyc-dev
Yi Kong [Thu, 16 Jun 2016 16:21:03 +0000 (16:21 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am:
53cf79e185
Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
Yi Kong [Thu, 16 Jun 2016 16:17:48 +0000 (16:17 +0000)]
Merge "Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp
Yi Kong [Thu, 16 Jun 2016 16:16:00 +0000 (16:16 +0000)]
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit
af823e0ebf987d5715d6df80b3c9335b4e3a2cdb)
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:07:49 +0000 (16:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am:
7d09db2830
Change-Id: I57f72e630688d91ca56adfb910232358746777e0
OSDN Git Service
