OSDN Git Service
Sudheer Shanka [Fri, 17 Jun 2016 21:04:05 +0000 (21:04 +0000)]
Merge \"Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
e1eb4cd0e7\" into nyc-mr1-dev-plus-aosp
am:
ff24b6055d
Change-Id: Id9b5de8d603cbd44b65294562a3d2797217d6cee
Sudheer Shanka [Fri, 17 Jun 2016 21:01:20 +0000 (21:01 +0000)]
Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
be8c83a6b9
am:
40636c8a2f
Change-Id: If9f8ef35e369a5a96ebed421bfb6119aac5125cd
Ta-wei Yen [Fri, 17 Jun 2016 21:01:11 +0000 (21:01 +0000)]
Merge \\"Allow the phone process to hide outbound text SMS\\" into nyc-mr1-dev am:
3f258857b5
am:
e5ffc4ac23
Change-Id: I65218336aa17420db78c4d03ae0aa054c96546cf
Bill Yi [Fri, 17 Jun 2016 21:01:03 +0000 (21:01 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
ecfe1a5e17 -s ours am:
7085bb345d -s ours
am:
8f0d2c8e0b -s ours
Change-Id: Ia889bdcc7a972027878d064ce25fcfc0daa0e112
Andrew Sapperstein [Fri, 17 Jun 2016 21:00:49 +0000 (21:00 +0000)]
Merge \\"Refactor DeviceDefault themes.\\" into nyc-mr1-dev am:
2f75cf4bb5
am:
91a540b2de
Change-Id: I7dbe63a9e71bb9ad6f58ef273965368057c17af0
John Reck [Fri, 17 Jun 2016 21:00:30 +0000 (21:00 +0000)]
Merge \\\\"Performance Optimization: Align texture dirty rect\\\\" am:
4e6a73c16a am:
ec45adde70 am:
89132e094f
am:
8ef6b2e628
Change-Id: I46613fa164ab541a313abeadd2b2c4a3b48aad50
Wale Ogunwale [Fri, 17 Jun 2016 20:43:51 +0000 (20:43 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am:
f6e3c9a553 am:
55ce4a5f19\" into nyc-mr1-dev-plus-aosp
am:
ca0b8d9096
Change-Id: Ibe4fa705e04fd63b1225e8fc27ef4ab0cb34f15d
Wale Ogunwale [Fri, 17 Jun 2016 20:43:44 +0000 (20:43 +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
am:
ac769204af
Change-Id: I8b8b26c094b81a89257a7d31ac122c27b6238efc
Andrii Kulian [Fri, 17 Jun 2016 20:43:37 +0000 (20:43 +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
am:
48b7342e1a
Change-Id: I9818dc145c1574207953336a20859ef482f1dc1e
Andrii Kulian [Fri, 17 Jun 2016 20:43:32 +0000 (20:43 +0000)]
Merge \\\"Bring task to front when we can\\\'t move to adjacent stack\\\" into nyc-dev am:
320c15e1b2 am:
8b7544fad7
am:
aef6cc7cc6
Change-Id: Ife079dba557e7cac06f8eb6c0b8214d92162417d
Yorke Lee [Fri, 17 Jun 2016 20:43:15 +0000 (20:43 +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
am:
fc6c1a8a8e
Change-Id: I0bce88dd079bc5b296fea12b2f5928e815eeb7d8
Yorke Lee [Fri, 17 Jun 2016 20:42:14 +0000 (20:42 +0000)]
Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am:
f33af2285b am:
3d80871032
am:
11e3bf5d30
Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
Gina Dimino [Fri, 17 Jun 2016 20:42:12 +0000 (20:42 +0000)]
Merge \"Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
0bae4dcd76\" into nyc-mr1-dev-plus-aosp
am:
ada74feacc
Change-Id: I9cdbd5cc246db9fee724b188223b3131e5548df7
Gina Dimino [Fri, 17 Jun 2016 20:42:09 +0000 (20:42 +0000)]
Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
b7181150c4
am:
cb08f6805a
Change-Id: I65d3016319d0cc53a53f931aa62c642ac53b9520
Yi Kong [Fri, 17 Jun 2016 20:42:06 +0000 (20:42 +0000)]
Merge \\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" into stage-aosp-master am:
e1cf90c6eb am:
e8f9aa9d5d
am:
c3c9fd12b4
Change-Id: I9246184c64dcfc41e4ab5070c74822746e22dc32
Przemyslaw Szczepaniak [Fri, 17 Jun 2016 20:42:04 +0000 (20:42 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am:
9f4ad4fbb6 am:
dd094522bd
am:
0de979e93d
Change-Id: I664cbb78538a0c7816e710287da9f80fe23fe465
Andrew Solovay [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
e73adf38a7\" into nyc-mr1-dev-plus-aosp
am:
95f4b1127c
Change-Id: I4f94adb27be1c04e89fee71500ab8f61b69f9bf1
Andrew Solovay [Fri, 17 Jun 2016 20:39:29 +0000 (20:39 +0000)]
Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
0d21553bd2
am:
f34c820174
Change-Id: Ib4a25b144e8d4599b70655481a08b4652742eef9
Yujie Qin [Fri, 17 Jun 2016 20:39:26 +0000 (20:39 +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
am:
032e0a6e5c
Change-Id: Icf9f6561ad7e4bcb45e7f2d4287803220770fe9f
Adrian Roos [Fri, 17 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge \"Merge \\\"Fix unresponsive brightness slider after font size change\\\" into nyc-dev am:
db81dd9d2e am:
6ed10f4ffa\" into nyc-mr1-dev-plus-aosp
am:
a360260ef8
Change-Id: I331a4f9cd4c0b4837ae270f363798eb272202b26
Yujie Qin [Fri, 17 Jun 2016 20:39:20 +0000 (20:39 +0000)]
Merge \\\"Report error correctly for the implementation of StreamInterface::GetData()\\\" into nyc-dev am:
e09415344d am:
d09b020ce5
am:
7d10f45325
Change-Id: I9e7bb583346aea5bd06ba84522d52f3e8c47b079
TreeHugger Robot [Fri, 17 Jun 2016 20:32:43 +0000 (20:32 +0000)]
Merge "resolve merge conflicts of
6800033 to master"
TreeHugger Robot [Fri, 17 Jun 2016 19:01:51 +0000 (19:01 +0000)]
Merge "Implementing breadcrumb for tablet devices for navigation in the bar."
Adrian Roos [Fri, 17 Jun 2016 18:57:56 +0000 (11:57 -0700)]
resolve merge conflicts of
6800033 to master
Change-Id: Ica5523a28f15f1c3e86a80b60a119e69705cd1c9
Steve McKay [Fri, 17 Jun 2016 18:33:53 +0000 (18:33 +0000)]
Merge \"Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
ba7fc3b35f\" into nyc-mr1-dev-plus-aosp
am:
5338c243c9
Change-Id: I53e32bd640eb60f407238aa6f37865515066df73
Steve McKay [Fri, 17 Jun 2016 18:33:50 +0000 (18:33 +0000)]
Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
be8b6e6164
am:
7dfb6fa15e
Change-Id: Iade90d4bfb323bcc1bb7a771fcb2b64656c25d57
Felipe Leme [Fri, 17 Jun 2016 18:33:48 +0000 (18:33 +0000)]
Merge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
f2326e947c\" into nyc-mr1-dev-plus-aosp
am:
6548d3ad83
Change-Id: I88c6d7a40488c18e6462325ee4cf1fafc4d57851
Felipe Leme [Fri, 17 Jun 2016 18:27:04 +0000 (18:27 +0000)]
Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
9b36b6d3d8
am:
b1c898ed65
Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a
Dianne Hackborn [Fri, 17 Jun 2016 18:27:00 +0000 (18:27 +0000)]
Merge \\"Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803\\" into nyc-mr1-dev am:
ab84ab5f35
am:
7aa2137c31
Change-Id: Iac9fde0171a021a19398d0f83d91aa00a5050fdf
Michael Kwan [Fri, 17 Jun 2016 18:26:57 +0000 (18:26 +0000)]
Merge \\"Add better configurability for dialog theme colours.\\" into nyc-mr1-dev am:
c637d4bde2
am:
2a68269a44
Change-Id: I0e30dfd1b9c970843e119b8058cea9553e7cb423
Dianne Hackborn [Fri, 17 Jun 2016 18:26:54 +0000 (18:26 +0000)]
Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803 am:
403e103eb2
am:
e022330079
Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8
Gustav Sennton [Fri, 17 Jun 2016 18:26:50 +0000 (18:26 +0000)]
Merge \"Merge \\\"Support using uninstalled WebView packages as WebView implementation.\\\" into nyc-dev am:
e25c8532b6 am:
4a352d2c41\" into nyc-mr1-dev-plus-aosp
am:
1cfb92097c
Change-Id: I5c8fee73cb32b27b9f6514c129285cca39d0755d
Ben Lin [Fri, 10 Jun 2016 19:13:27 +0000 (12:13 -0700)]
Implementing breadcrumb for tablet devices for navigation in the bar.
Bug:
29214736
Change-Id: I37de2c39a55c33d7111496e896a0c85e1c7fa553
(cherry picked from commit
6fb1dfcc47b795b7071550a4524667d2f8f4d9a2)
Aurimas Liutikas [Fri, 17 Jun 2016 16:26:55 +0000 (16:26 +0000)]
Merge "Fix spelling error in Core App Quality docs."
Mikhail Naganov [Fri, 17 Jun 2016 15:32:00 +0000 (15:32 +0000)]
Merge "UsbMidiDevice: Clean up terminology and fix comments"
Mikhail Naganov [Fri, 17 Jun 2016 11:11:25 +0000 (04:11 -0700)]
UsbMidiDevice: Clean up terminology and fix comments
When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.
Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.
Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2
Gustav Sennton [Fri, 17 Jun 2016 10:49:53 +0000 (10:49 +0000)]
Merge "resolve merge conflicts of
6cbf137 to master"
Gustav Sennton [Thu, 16 Jun 2016 19:24:23 +0000 (20:24 +0100)]
resolve merge conflicts of
6cbf137 to master
Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f
Seigo Nonaka [Fri, 17 Jun 2016 03:59:51 +0000 (03:59 +0000)]
Merge "Follow the minikin namespace changes"
Donghyun Cho [Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)]
Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata"
TreeHugger Robot [Fri, 17 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge "[multi-part] Eliminate 1k selection limit"
TreeHugger Robot [Fri, 17 Jun 2016 01:28:52 +0000 (01:28 +0000)]
Merge "Quick fix for Files crashing on start up."
Sergei Vasilinetc [Fri, 17 Jun 2016 00:57:50 +0000 (00:57 +0000)]
Merge "Test scene that mocks list view with text items faded on left edge."
Steve McKay [Thu, 9 Jun 2016 17:46:07 +0000 (10:46 -0700)]
[multi-part] Eliminate 1k selection limit
* Save selection to disk, delete old selections on app startup.
* Do clipper work in background for copy/cut.
* Pull DragShadowBuilder out of DirFragment.
* Reorganize selection handling to avoid creation of large lists of objects.
* Eliminate getAll from selection, make it iterable, remove unused method.
* Avoid creating DocumentInfo instances for full selection when initiating drag and drop.
Next step will be to pass selection tokens to FileOperationService.
Change-Id: Ia3e30a88ebf328e5b045d06b0df15dbd26a01a42
(cherry picked from commit
69b63de63ddae8d1a3ad8fa49a0beb1ff6f921e1)
sergeyv [Thu, 16 Jun 2016 21:52:20 +0000 (14:52 -0700)]
Test scene that mocks list view with text items faded on left edge.
Change-Id: I6159f02fa511241beaff4f0eb605c4f0bee360d1
Android Build Merger (Role) [Thu, 16 Jun 2016 22:46:36 +0000 (22:46 +0000)]
Merge "Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7 am:
e1eb4cd0e7" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Thu, 16 Jun 2016 22:46:05 +0000 (22:46 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7
am:
e1eb4cd0e7
Change-Id: I9539a9ebc51b3e89bfff3a47f55071daae265546
Sudheer Shanka [Thu, 16 Jun 2016 22:45:41 +0000 (22:45 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7
am:
be8c83a6b9
Change-Id: I479843ca4a8b21d11191106a8090bcaf7e78ea6c
Sudheer Shanka [Thu, 16 Jun 2016 22:38:52 +0000 (22:38 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am:
48ee87d4a7
Change-Id: I3f66f1d5937ed29f62d687d1c0c6dcfa7d88637d
Ta-wei Yen [Thu, 16 Jun 2016 22:38:43 +0000 (22:38 +0000)]
Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am:
3f258857b5
Change-Id: Id54d7ac48c857234e43b828368ff0cd53facc0b0
Sudheer Shanka [Thu, 16 Jun 2016 22:37:38 +0000 (22:37 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am:
48ee87d4a7
Change-Id: Ib61fe36aef8fc992e87ccaa692cc2712caf36570
TreeHugger Robot [Thu, 16 Jun 2016 22:31:44 +0000 (22:31 +0000)]
Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge "Allow apps with CREATE_USERS permission to create restricted users." into nyc-dev
Bill Yi [Thu, 16 Jun 2016 22:15:59 +0000 (22:15 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
ecfe1a5e17 -s ours
am:
7085bb345d -s ours
Change-Id: If6b7101a6e4cd6c81e41d98a30b65c231d574f2a
Andrew Sapperstein [Thu, 16 Jun 2016 22:08:07 +0000 (22:08 +0000)]
Merge \"Refactor DeviceDefault themes.\" into nyc-mr1-dev
am:
2f75cf4bb5
Change-Id: I17994da6c924596798b03cd684005dd0b71ab2c9
Bill Yi [Thu, 16 Jun 2016 22:07:44 +0000 (22:07 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
ecfe1a5e17 -s ours
Change-Id: Icbdc4c2b98737adce95437613b0d0fc846a5a7e9
Bill Yi [Thu, 16 Jun 2016 21:59:43 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
ywen [Thu, 16 Jun 2016 21:59:21 +0000 (21:59 +0000)]
Merge \\\"Performance Optimization: Align texture dirty rect\\\" am:
4e6a73c16a am:
ec45adde70
am:
89132e094f
Change-Id: I198fc7403ad5e42dbb0caaac33185c8169b3aebc
Andrew Sapperstein [Thu, 16 Jun 2016 21:58:54 +0000 (21:58 +0000)]
Merge "Refactor DeviceDefault themes." into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 21:50:43 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I987370579e491a8a7691748f090d111c93e3a89d
John Reck [Thu, 16 Jun 2016 21:47:55 +0000 (21:47 +0000)]
Merge \\"Performance Optimization: Align texture dirty rect\\" am:
4e6a73c16a
am:
ec45adde70
Change-Id: Ice5c2f216dab71fe26b07f9299f8c4300b80f665
Android Build Merger (Role) [Thu, 16 Jun 2016 21:42:40 +0000 (21:42 +0000)]
Merge "Merge \\"Don\\'t re-launch activities while the device is sleeping\\" into nyc-dev am:
f6e3c9a553 am:
55ce4a5f19" into nyc-mr1-dev-plus-aosp
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
ywen [Thu, 16 Jun 2016 21:42:13 +0000 (21:42 +0000)]
Merge \"Performance Optimization: Align texture dirty rect\"
am:
4e6a73c16a
Change-Id: I2bafdfadd3d6ff88be44475f77158236015acfde
Wale Ogunwale [Thu, 16 Jun 2016 21:42:00 +0000 (21:42 +0000)]
Merge \\"Don\\'t re-launch activities while the device is sleeping\\" into nyc-dev am:
f6e3c9a553
am:
55ce4a5f19
Change-Id: I10ca3411e66acc2e156339645b5548c6d3f71d46
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:25 +0000 (21:36 +0000)]
Merge \"Don\'t re-launch activities while the device is sleeping\" into nyc-dev
am:
f6e3c9a553
Change-Id: I72d39e81ae786f18fb3991fb243837e802440311
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
John Reck [Thu, 16 Jun 2016 21:35:12 +0000 (21:35 +0000)]
Merge "Performance Optimization: Align texture dirty rect"
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
Ben Lin [Thu, 16 Jun 2016 21:06:05 +0000 (14:06 -0700)]
Quick fix for Files crashing on start up.
Change-Id: I98df90b6bdf5caacb7565ead7051e507abfff23d
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