OSDN Git Service
Android Build Merger (Role) [Tue, 19 Jul 2016 01:42:18 +0000 (01:42 +0000)]
Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527 am:
4f88587f65 -s ours am:
3fc550a0e3 am:
d6c5a06460" into nyc-mr1-dev-plus-aosp
Sungsoo Lim [Tue, 19 Jul 2016 01:41:41 +0000 (01:41 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527 am:
4f88587f65 -s ours am:
3fc550a0e3
am:
d6c5a06460
Change-Id: Ia677698b5feb5692e0fa55c54777d903a6507bec
Sungsoo Lim [Tue, 19 Jul 2016 01:41:17 +0000 (01:41 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a am:
e863a0c868 am:
16b9011dd5 -s ours am:
f5cddc7ef6
am:
2991db7ed2
Change-Id: I77352eb32520f928350714e769af1330ff840090
Adam Lesinski [Tue, 19 Jul 2016 01:41:14 +0000 (01:41 +0000)]
Merge \"AAPT: Don\'t keep processing files that failed to be added\" into nyc-mr1-dev
am:
d94f55552f
Change-Id: I9f91b3b8a66a2bd0d1fc27ddcdea2f72f0a54b58
Sungsoo Lim [Tue, 19 Jul 2016 01:41:08 +0000 (01:41 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527 am:
4f88587f65 -s ours am:
3fc550a0e3
am:
3ab0b4a1a8
Change-Id: I606047dbda45111756c37108bcf51ddebf8c6243
Sungsoo Lim [Tue, 19 Jul 2016 01:35:30 +0000 (01:35 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a am:
e863a0c868 am:
16b9011dd5 -s ours
am:
f5cddc7ef6
Change-Id: Ic7831519d3aacd7988960c1278bf8a6bf9b280a3
TreeHugger Robot [Tue, 19 Jul 2016 01:29:28 +0000 (01:29 +0000)]
Merge "AAPT: Don't keep processing files that failed to be added" into nyc-mr1-dev
Sungsoo Lim [Tue, 19 Jul 2016 01:28:08 +0000 (01:28 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a am:
e863a0c868
am:
16b9011dd5 -s ours
Change-Id: I4814fcb307d5e577ed5b3ea3f66ab9949035e3ca
Sungsoo Lim [Tue, 19 Jul 2016 01:26:29 +0000 (01:26 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527 am:
4f88587f65 -s ours
am:
3fc550a0e3
Change-Id: Ic6e32a4bd6916290a2f4ed9d098c33d42320cfde
Sungsoo Lim [Tue, 19 Jul 2016 01:26:21 +0000 (01:26 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527 am:
4f88587f65 -s ours
am:
3fc550a0e3
Change-Id: I41c724a0839ab43583dd1d4391302138f7e5605a
Android Build Merger (Role) [Tue, 19 Jul 2016 01:20:46 +0000 (01:20 +0000)]
Merge "Merge \\"docs: Fixed indentation for android:required attribute\\" into nyc-dev am:
831ea9e190 am:
bf441b392b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 19 Jul 2016 01:20:29 +0000 (01:20 +0000)]
Merge "Merge \\"docs: fix typo error in class name\\" into nyc-dev am:
35d61e4117 am:
9d7d33a407" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 19 Jul 2016 01:20:13 +0000 (01:20 +0000)]
Merge "Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d am:
f78637ff64 -s ours am:
19d013d4e3 am:
091cdab02d" into nyc-mr1-dev-plus-aosp
Mark Lu [Tue, 19 Jul 2016 01:19:29 +0000 (01:19 +0000)]
Merge \\"docs: Fixed indentation for android:required attribute\\" into nyc-dev am:
831ea9e190
am:
bf441b392b
Change-Id: I4b3ae5943e048cfea26838a1c9e2e60622c5a4f8
Sungsoo Lim [Tue, 19 Jul 2016 01:19:16 +0000 (01:19 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503 am:
f98fcae527
am:
4f88587f65 -s ours
Change-Id: I0da0be3e09c6f27ae6e88ad486c5f8d907e2728a
Mark Lu [Tue, 19 Jul 2016 01:19:14 +0000 (01:19 +0000)]
Merge \\"docs: Fixed indentation for android:required attribute\\" into nyc-dev am:
831ea9e190
am:
d88928aaf5
Change-Id: I8b90852db53247ec743a2f30b0ab6cd83396f1c4
Mark Lu [Tue, 19 Jul 2016 01:19:13 +0000 (01:19 +0000)]
Merge \\"docs: fix typo error in class name\\" into nyc-dev am:
35d61e4117
am:
9d7d33a407
Change-Id: Iab63b676e08c061b7f07bfa124eb30ec5f1fdc99
Mark Lu [Tue, 19 Jul 2016 01:19:03 +0000 (01:19 +0000)]
Merge \\"docs: fix typo error in class name\\" into nyc-dev am:
35d61e4117
am:
2025a23bcb
Change-Id: I7255c3dc05a55506a09081c8bee387382601e04e
Sungsoo Lim [Tue, 19 Jul 2016 01:18:57 +0000 (01:18 +0000)]
Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d am:
f78637ff64 -s ours am:
19d013d4e3
am:
091cdab02d
Change-Id: I8b93dd198bdcbd28cad847e6765d21b0743a5efd
Sungsoo Lim [Tue, 19 Jul 2016 01:18:35 +0000 (01:18 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d am:
d8f381af5a
am:
e863a0c868
Change-Id: Iac2d21886968fb4db06d0c136fad09730aa72662
Sungsoo Lim [Tue, 19 Jul 2016 01:13:53 +0000 (01:13 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours am:
d1b350ce7d
am:
d8f381af5a
Change-Id: I80023836cc9fc1bda49c65d0f1cb819310fc1df3
Sungsoo Lim [Tue, 19 Jul 2016 01:12:40 +0000 (01:12 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5 am:
e8a7640503
am:
f98fcae527
Change-Id: Ib968326fe95bbd34f50c7764a17b21af01e377a7
Sungsoo Lim [Tue, 19 Jul 2016 01:12:17 +0000 (01:12 +0000)]
Merge \\\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d am:
f78637ff64 -s ours am:
19d013d4e3
am:
7b61d99c4e
Change-Id: If5ead984671b499cc5528ec14224dd5339eeeb5d
Mark Lu [Tue, 19 Jul 2016 01:08:39 +0000 (01:08 +0000)]
Merge \"docs: Fixed indentation for android:required attribute\" into nyc-dev
am:
831ea9e190
Change-Id: If9bf78d0077b4799dcbc82222fcc393519d041d6
Mark Lu [Tue, 19 Jul 2016 01:08:35 +0000 (01:08 +0000)]
Merge \"docs: fix typo error in class name\" into nyc-dev
am:
35d61e4117
Change-Id: I79840e467314db0ec5756f94750ff46f272c9a5d
Mark Lu [Tue, 19 Jul 2016 01:08:33 +0000 (01:08 +0000)]
Merge \"docs: Fixed indentation for android:required attribute\" into nyc-dev
am:
831ea9e190
Change-Id: Idf228fe63fcfa75c20fd755dd2b6b75a6bf48eaa
Mark Lu [Tue, 19 Jul 2016 01:08:30 +0000 (01:08 +0000)]
Merge \"docs: fix typo error in class name\" into nyc-dev
am:
35d61e4117
Change-Id: I88bd65d22260d6f47905bed60ce7c0c58ed2bc0e
Sungsoo Lim [Tue, 19 Jul 2016 01:08:25 +0000 (01:08 +0000)]
Merge \\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d am:
f78637ff64 -s ours
am:
19d013d4e3
Change-Id: I866cc55f30a582ef95fb91a81528ad364eabfe98
Sungsoo Lim [Tue, 19 Jul 2016 01:08:17 +0000 (01:08 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09 am:
4e192f9a04 -s ours
am:
d1b350ce7d
Change-Id: I2dfbdb7f5b716d2795f883b333c1339c4fd6c0a3
Sungsoo Lim [Tue, 19 Jul 2016 01:03:31 +0000 (01:03 +0000)]
Merge \\\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d am:
f78637ff64 -s ours
am:
19d013d4e3
Change-Id: Id02a25576d59232781a776cbb8c4f7e57db9cedf
Sungsoo Lim [Tue, 19 Jul 2016 01:03:18 +0000 (01:03 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours am:
a2044118a5
am:
e8a7640503
Change-Id: I0e9a8731a75135d91103e1f3067aba2b1c90e79d
TreeHugger Robot [Tue, 19 Jul 2016 00:59:25 +0000 (00:59 +0000)]
Merge "docs: Fixed indentation for android:required attribute" into nyc-dev
TreeHugger Robot [Tue, 19 Jul 2016 00:56:28 +0000 (00:56 +0000)]
Merge "docs: fix typo error in class name" into nyc-dev
Sungsoo Lim [Tue, 19 Jul 2016 00:54:24 +0000 (00:54 +0000)]
Merge \\\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee am:
452dc91f2d
am:
f78637ff64 -s ours
Change-Id: Ia67c680bd2a72b7e0ce4f6d1225bc85b1b4feadb
Sungsoo Lim [Tue, 19 Jul 2016 00:53:31 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508 am:
82a7ad2b09
am:
4e192f9a04 -s ours
Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0
Sungsoo Lim [Tue, 19 Jul 2016 00:53:14 +0000 (00:53 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161 am:
d35b114a35 -s ours
am:
a2044118a5
Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c
Sungsoo Lim [Tue, 19 Jul 2016 00:47:11 +0000 (00:47 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours am:
1ae841f508
am:
82a7ad2b09
Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6
Sungsoo Lim [Tue, 19 Jul 2016 00:46:25 +0000 (00:46 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3 am:
57aaad8161
am:
d35b114a35 -s ours
Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58
Sungsoo Lim [Tue, 19 Jul 2016 00:46:16 +0000 (00:46 +0000)]
Merge \\\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\\" into mnc-dev am:
f4710c174f am:
aa85bf99ee
am:
452dc91f2d
Change-Id: Ie64f0351a6cf2e4b07bffd85c6dbbd9d7239ce32
Sungsoo Lim [Tue, 19 Jul 2016 00:40:46 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
3261c5f7b3
am:
57aaad8161
Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698
Sungsoo Lim [Tue, 19 Jul 2016 00:40:42 +0000 (00:40 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface am:
9fffc56cb1 -s ours
am:
1ae841f508
Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad
Dmitriy Filchenko [Tue, 19 Jul 2016 00:39:17 +0000 (00:39 +0000)]
Merge \\\"Handle long process names correctly.\\\" am:
e2994438d2 am:
d5a72fae4a
am:
ea9616e48e
Change-Id: Ib14e7dbbba8f91de0491be9b91b5891ce8520c00
Sungsoo Lim [Tue, 19 Jul 2016 00:38:54 +0000 (00:38 +0000)]
Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am:
f4710c174f
am:
aa85bf99ee
Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611
Sungsoo Lim [Tue, 19 Jul 2016 00:32:25 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am:
9fffc56cb1 -s ours
Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96
Sungsoo Lim [Tue, 19 Jul 2016 00:32:24 +0000 (00:32 +0000)]
Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am:
f4710c174f
Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3
Sungsoo Lim [Tue, 19 Jul 2016 00:32:10 +0000 (00:32 +0000)]
DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am:
3261c5f7b3
Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78
Dmitriy Filchenko [Tue, 19 Jul 2016 00:27:02 +0000 (00:27 +0000)]
Merge \\"Handle long process names correctly.\\" am:
e2994438d2
am:
d5a72fae4a
Change-Id: I18b5e389b35b3d4756dc8ab9094349310eeccf14
Tim Murray [Tue, 19 Jul 2016 00:25:52 +0000 (00:25 +0000)]
Merge changes I15da2563,I7845542d into nyc-mr1-dev
am:
7b8b1aab93
Change-Id: I66d92cd3c08a67598cefdc6256825b1c6c1736f5
Sungsoo Lim [Tue, 19 Jul 2016 00:21:51 +0000 (00:21 +0000)]
Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev
Tim Murray [Tue, 19 Jul 2016 00:20:01 +0000 (00:20 +0000)]
Merge changes I15da2563,I7845542d into nyc-mr1-dev
* changes:
Don't reset current thread's priority accidentally.
add tracepoint for when the display chain is stuffed
Dmitriy Filchenko [Tue, 19 Jul 2016 00:19:15 +0000 (00:19 +0000)]
Merge \"Handle long process names correctly.\"
am:
e2994438d2
Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358
Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]
Merge "Handle long process names correctly."
Adam Lesinski [Tue, 19 Jul 2016 00:01:14 +0000 (17:01 -0700)]
AAPT: Don't keep processing files that failed to be added
AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.
Bug:
30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937
Android Build Merger (Role) [Mon, 18 Jul 2016 23:54:25 +0000 (23:54 +0000)]
Merge "Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am:
0544462bf1 am:
d87be07644" into nyc-mr1-dev-plus-aosp
Dmitry Dementyev [Mon, 18 Jul 2016 23:53:52 +0000 (23:53 +0000)]
Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am:
0544462bf1
am:
33c20d39e3
Change-Id: I8857fc1e39fbd9c2368e6f341a1c3cffaaaeaf16
Dmitry Dementyev [Mon, 18 Jul 2016 23:53:52 +0000 (23:53 +0000)]
Merge \\"Include correct account id in action_called_account_remove log message.\\" into nyc-dev am:
0544462bf1
am:
d87be07644
Change-Id: I241865f791d8da241e17aa0dfa245b8eb5ba7ada
Dmitry Dementyev [Mon, 18 Jul 2016 23:48:59 +0000 (23:48 +0000)]
Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev
am:
0544462bf1
Change-Id: Iaedf8dbf5fb7ee68eebe1026ab3867f544948db9
Dmitry Dementyev [Mon, 18 Jul 2016 23:48:53 +0000 (23:48 +0000)]
Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev
am:
0544462bf1
Change-Id: Ibc72de68280c0d859e8391654f4d67de66515800
Dmitry Dementyev [Mon, 18 Jul 2016 23:37:29 +0000 (23:37 +0000)]
Merge "Include correct account id in action_called_account_remove log message." into nyc-dev
Selim Cinek [Mon, 18 Jul 2016 23:11:32 +0000 (23:11 +0000)]
Merge \"Don\'t show repeated fingerprint error messages on bouncer\" into nyc-mr1-dev
am:
a3724775a4
Change-Id: I7d888edff3fb7bb0ba7c52dcec698e346a002524
Jeff Sharkey [Mon, 18 Jul 2016 23:11:28 +0000 (23:11 +0000)]
Merge \"Handle auto-unlocked managed profiles.\" into nyc-mr1-dev
am:
2b58e464bb
Change-Id: Idc9ecd57f65a9ad273407ca0ebc30ad7fd15dcc7
Selim Cinek [Mon, 18 Jul 2016 23:05:27 +0000 (23:05 +0000)]
Merge "Don't show repeated fingerprint error messages on bouncer" into nyc-mr1-dev
Dmitriy Filchenko [Mon, 18 Jul 2016 23:00:35 +0000 (16:00 -0700)]
Handle long process names correctly.
pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.
Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
Jeff Sharkey [Mon, 18 Jul 2016 23:02:45 +0000 (23:02 +0000)]
Merge "Handle auto-unlocked managed profiles." into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 22:51:33 +0000 (22:51 +0000)]
Merge "Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am:
bd80098059 am:
4e98676ed3" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Mon, 18 Jul 2016 22:51:05 +0000 (22:51 +0000)]
Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am:
bd80098059
am:
4e98676ed3
Change-Id: I6b1be04747d205eb7b139425a2b2f257e909bddb
Andrew Solovay [Mon, 18 Jul 2016 22:51:03 +0000 (22:51 +0000)]
Merge \\"docs: Removed Sony Experia from N Preview download page\\" into nyc-dev am:
bd80098059
am:
14c55bce2f
Change-Id: I403cd225ce16404acfd6bd054ada1c7dd456595a
Andrew Solovay [Mon, 18 Jul 2016 22:45:12 +0000 (22:45 +0000)]
Merge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
am:
bd80098059
Change-Id: I31a819f07c06d1f3d131eaa51e438930c0f3f9da
Andrew Solovay [Mon, 18 Jul 2016 22:44:53 +0000 (22:44 +0000)]
Merge \"docs: Removed Sony Experia from N Preview download page\" into nyc-dev
am:
bd80098059
Change-Id: I6c643be53bdec19cfc1f814644f913621a6707ff
Tim Murray [Mon, 18 Jul 2016 22:35:42 +0000 (15:35 -0700)]
Don't reset current thread's priority accidentally.
If there's no RenderThread for the top app and FIFO UI is enabled, it's
possible to reset the current system_server thread's priority and
scheduler.
bug
30173296
Change-Id: I15da2563356ddd66911d695db43660ce5400da07
Tim Murray [Mon, 18 Jul 2016 21:11:28 +0000 (14:11 -0700)]
add tracepoint for when the display chain is stuffed
bug
30173296
Change-Id: I7845542d4e5c19ccb7c3ee6498cc2d70278b5397
TreeHugger Robot [Mon, 18 Jul 2016 22:34:13 +0000 (22:34 +0000)]
Merge "docs: Removed Sony Experia from N Preview download page" into nyc-dev
Eino-Ville Talvala [Mon, 18 Jul 2016 21:30:30 +0000 (21:30 +0000)]
Merge \"CameraMetadata JNI: Move tag lookup to common utility code\" into nyc-mr1-dev
am:
ff080be098
Change-Id: Ica003bc034d6e0a741c2dda3e7c3bfc5756ce2cf
Eino-Ville Talvala [Mon, 18 Jul 2016 21:25:35 +0000 (21:25 +0000)]
Merge "CameraMetadata JNI: Move tag lookup to common utility code" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 21:25:15 +0000 (21:25 +0000)]
Merge "Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0 am:
507c9165d1" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Mon, 18 Jul 2016 21:24:52 +0000 (21:24 +0000)]
Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0
am:
507c9165d1
Change-Id: I2d01fdf589bd3492cfdcd28f5410c95dd3ea7fd2
Andrew Solovay [Mon, 18 Jul 2016 21:24:30 +0000 (21:24 +0000)]
Merge \\"docs: Late-breaking updates to DP5 release notes\\" into nyc-dev am:
142d1214d0
am:
74171f88c2
Change-Id: I281ca582bc2461e8e099e731cd6126e7bddf0b16
Andrew Solovay [Mon, 18 Jul 2016 21:15:53 +0000 (21:15 +0000)]
Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am:
142d1214d0
Change-Id: I565e615e575eed25ae2957fbaf7de72b97541739
Adam Lesinski [Mon, 18 Jul 2016 21:15:48 +0000 (21:15 +0000)]
Merge \"Record UID of wakeup packets\" into nyc-mr1-dev
am:
117cf8de91
Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f
Andrew Solovay [Mon, 18 Jul 2016 21:15:20 +0000 (21:15 +0000)]
Merge \"docs: Late-breaking updates to DP5 release notes\" into nyc-dev
am:
142d1214d0
Change-Id: I6344b9fc5f70f6f02bcc5044bb40e42bda3433b8
Jim Miller [Mon, 18 Jul 2016 21:09:37 +0000 (21:09 +0000)]
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
am:
6ad9c16ffd
Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d
TreeHugger Robot [Mon, 18 Jul 2016 21:07:34 +0000 (21:07 +0000)]
Merge "docs: Late-breaking updates to DP5 release notes" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:58:13 +0000 (20:58 +0000)]
Merge "Record UID of wakeup packets" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
Tyler Gunn [Mon, 18 Jul 2016 20:24:37 +0000 (20:24 +0000)]
Merge \"Enhance toString on ConferenceParticipant.\" into nyc-mr1-dev
am:
b822f7a956
Change-Id: I7b6b1a94fd04b22755cba511b674f128ee63260b
Tyler Gunn [Mon, 18 Jul 2016 20:13:31 +0000 (20:13 +0000)]
Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 20:09:07 +0000 (20:09 +0000)]
Merge "Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac am:
a5e5cf6a84" into nyc-mr1-dev-plus-aosp
Mark Lu [Mon, 18 Jul 2016 20:08:39 +0000 (20:08 +0000)]
Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac
am:
a5e5cf6a84
Change-Id: I87606bd4b170bcf8b0a76652f9da3892be524059
Mark Lu [Mon, 18 Jul 2016 20:08:37 +0000 (20:08 +0000)]
Merge \\"docs: remove trailing white space from jd files\\" into nyc-dev am:
242f5798ac
am:
f46504d95e
Change-Id: Ie98db8eaeadffa5c7a39fd08c41961a798ee8442
Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]
Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am:
242f5798ac
Change-Id: Id3692c9293f6e41fb57188e5a7641f913c690a56
Mark Lu [Mon, 18 Jul 2016 19:55:28 +0000 (19:55 +0000)]
Merge \"docs: remove trailing white space from jd files\" into nyc-dev
am:
242f5798ac
Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c
Mark Lu [Mon, 18 Jul 2016 19:48:50 +0000 (19:48 +0000)]
Merge "docs: remove trailing white space from jd files" into nyc-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 19:36:38 +0000 (19:36 +0000)]
Merge "Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883 am:
f1172504de" into nyc-mr1-dev-plus-aosp
Scott Main [Mon, 18 Jul 2016 19:36:12 +0000 (19:36 +0000)]
Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883
am:
f1172504de
Change-Id: I4c590a2bfa09e021eac40057f60e3143ce096940
Scott Main [Mon, 18 Jul 2016 19:34:49 +0000 (19:34 +0000)]
Merge \\"add redirect for \\"getting started\\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\\" into nyc-dev am:
56bacea883
am:
6e446a5f38
Change-Id: I33812f3e71fda1975e1edd6e6de48a0436c700e6
Adam Lesinski [Thu, 14 Jul 2016 23:56:08 +0000 (16:56 -0700)]
Record UID of wakeup packets
Bug:
28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]
Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am:
56bacea883
Change-Id: Ib620e4caf5e5a9ca9e10a0daa9dce13d6622cf61
smain@google.com [Mon, 18 Jul 2016 19:27:18 +0000 (19:27 +0000)]
Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev
am:
56bacea883
Change-Id: I00dbf309d7e1c79d93733e6c3aa08ec7eca41401
Scott Main [Mon, 18 Jul 2016 19:19:45 +0000 (19:19 +0000)]
Merge "add redirect for "getting started" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics" into nyc-dev
smain@google.com [Fri, 15 Jul 2016 22:25:25 +0000 (15:25 -0700)]
add redirect for "getting started" help button in Studio.
Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics
Change-Id: I914d4fac51d3cf7e839a7b5785a7c8cd43b57346
OSDN Git Service
