git.osdn.net Git - android-x86/frameworks-base.git/log

Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:37 +0000 (03:19 +0000)]

Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e am: 8cb020227d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:28 +0000 (03:19 +0000)]

Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e am: aa63aab59e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 03:19:21 +0000 (03:19 +0000)]

Merge "Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am: e25fd0eda8 am: 0ff26ec64e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:18:39 +0000 (03:18 +0000)]

Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e
am: 8cb020227d

Change-Id: Iac30188cb146eb77eae58663b7fde74d68fdf6f9

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:18:36 +0000 (03:18 +0000)]

Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e
am: aa63aab59e

Change-Id: I822dbc5660e102156be19b5f59ba846dd2bc3078

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:18:34 +0000 (03:18 +0000)]

Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am: e25fd0eda8
am: 0ff26ec64e

Change-Id: I3199ac3b1b2a41c3a0c399033bb6bbd5188b18da

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:18:33 +0000 (03:18 +0000)]

Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am: e25fd0eda8
am: eb2835329f

Change-Id: I3d70763a6370a138e069fd1b17687b29d070e5ba

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:13:27 +0000 (03:13 +0000)]

Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am: b79aac7a0e

Change-Id: If2e96ea7656a43a2f568f599378d1ae74fb25f0a

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:13:18 +0000 (03:13 +0000)]

Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am: e25fd0eda8

Change-Id: Ia4152d80b5701c5108aec6f399d4d97a3ef98473

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:13:10 +0000 (03:13 +0000)]

Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am: b79aac7a0e

Change-Id: I9b41c494aa7d26f60a6856ddf877faf127dc70e8

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:13:08 +0000 (03:13 +0000)]

Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am: e25fd0eda8

Change-Id: I0e3d131c0c0a259201fed4aa0209231a5cec000e

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:05:35 +0000 (03:05 +0000)]

Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev

commit | commitdiff | tree

Kevin Hufnagle [Tue, 19 Jul 2016 03:05:08 +0000 (03:05 +0000)]

Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Mon, 18 Jul 2016 22:01:56 +0000 (15:01 -0700)]

Fix build: Remove unused debug flag

Change-Id: I929df7018aba8ac7677aa30c17bd842599697ac7
(cherry picked from commit bc0580db5f42d3525609d5bfef16ab8e3b43b548)

commit | commitdiff | tree

Andrew Sapperstein [Tue, 19 Jul 2016 02:11:05 +0000 (02:11 +0000)]

Merge \"Update bugreport dialog to DeviceDefault theme.\" into nyc-mr1-dev
am: 878bd5103e

Change-Id: I918da483da287b36f49b103a5823f5ca81b2f4c0

commit | commitdiff | tree

Justin Klaassen [Tue, 19 Jul 2016 02:11:00 +0000 (02:11 +0000)]

Merge \"Cleanup TwilightService\" into nyc-mr1-dev
am: e5aeca3dc9

Change-Id: Iac61d988c3432b8f78eb7d06dd3bb8d706fec621

commit | commitdiff | tree

TreeHugger Robot [Tue, 19 Jul 2016 02:03:53 +0000 (02:03 +0000)]

Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 19 Jul 2016 02:02:06 +0000 (02:02 +0000)]

Merge "Cleanup TwilightService" into nyc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 01:53:15 +0000 (01:53 +0000)]

Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988 -s ours am: aa93e8571f am: e6c39fb5b3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:52:43 +0000 (01:52 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988 -s ours am: aa93e8571f
am: e6c39fb5b3

Change-Id: Ic33d6605590b86aa3d9de45743439afa940d73cb

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:52:37 +0000 (01:52 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988 -s ours am: aa93e8571f
am: 8617f22697

Change-Id: I1c4bb9cab54e08b3f2c6ffe2ccf04b42b6b1b68d

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:46:44 +0000 (01:46 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988 -s ours
am: aa93e8571f

Change-Id: Ic0996d300d9040c34df527244c9e39b2215f2d95

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:46:43 +0000 (01:46 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1 am: 249acab988 -s ours
am: aa93e8571f

Change-Id: I03c704e599fa56ee2555386af36dfb8be38f74c5

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 19 Jul 2016 01:42:30 +0000 (01:42 +0000)]

Merge "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: b4f2154ee2" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:41:44 +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: b4f2154ee2

Change-Id: Idfa4d28db6b371251ca9acc00c507b202c265766

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:41:08 +0000 (01:41 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558 am: 9e48fa5de1
am: 249acab988 -s ours

Change-Id: Ia722ab69188cbf569a67c97d340da8634c2f7f7f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:35:26 +0000 (01:35 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa am: a1f106b558
am: 9e48fa5de1

Change-Id: I2e278c6a3cf3763520321253751fc55ba3026d59

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:34:09 +0000 (01:34 +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: I8282937536d811d7d8728bca5649496d83a7867f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:26:16 +0000 (01:26 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa
am: a1f106b558

Change-Id: I8b67e9f8958f99adb0e07d4ad857ad8e388dfb54

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:18:25 +0000 (01:18 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours
am: 3e4c8a96fa

Change-Id: Ieab0b4aa107ce1471d601ab65051d9ed0ec18e8a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:12:12 +0000 (01:12 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6
am: 407bb6ad53 -s ours

Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:08:02 +0000 (01:08 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6
am: aa0ad336b6

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:03:31 +0000 (01:03 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 19 Jul 2016 00:59:25 +0000 (00:59 +0000)]

Merge "docs: Fixed indentation for android:required attribute" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 19 Jul 2016 00:56:28 +0000 (00:56 +0000)]

Merge "docs: fix typo error in class name" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:53:30 +0000 (00:53 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours
am: 6e0cedcaf6

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:45:32 +0000 (00:45 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours
am: 3900104379 -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:38:08 +0000 (00:38 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
am: 710605dccf -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:38 +0000 (00:32 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:23:32 +0000 (00:23 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrew Sapperstein [Tue, 19 Jul 2016 00:19:15 +0000 (17:19 -0700)]

Update bugreport dialog to DeviceDefault theme.

By using DeviceDefault instead of Material, this UI is now
resilient to any platform-level theme changes.

Change-Id: I43ce61b36f4c089ee07f754088abe2dfe6700877
Fixes: 30173174

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 19 Jul 2016 00:19:15 +0000 (00:19 +0000)]

Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358

commit | commitdiff | tree

Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]

Merge "Handle long process names correctly."

commit | commitdiff | tree

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

commit | commitdiff | tree

Justin Klaassen [Tue, 12 Jul 2016 20:36:45 +0000 (13:36 -0700)]

Cleanup TwilightService

TwilightService now just reports the current twilight state, it's up to
clients to provide their own locking mechanism (e.g. always day or
night).

Bug: 29620105
Change-Id: I2a8bb544eab0f44d269c59f36a53fbdf842b423a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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