OSDN Git Service
Andrew Solovay [Tue, 19 Jul 2016 18:46:34 +0000 (18:46 +0000)]
Merge \\"docs: Late-breaking Behavior Changes addition for N Preview 5\\" into nyc-dev am:
34d488b831
am:
98a029f826
Change-Id: I7b91f368975cb5591890def4339690fde83017e3
Andrew Solovay [Tue, 19 Jul 2016 18:39:24 +0000 (18:39 +0000)]
Merge \"docs: Late-breaking Behavior Changes addition for N Preview 5\" into nyc-dev
am:
34d488b831
Change-Id: I3e1ec736dc753d56c515246e5a09f4679d14c296
Andrew Solovay [Tue, 19 Jul 2016 18:34:13 +0000 (18:34 +0000)]
Merge "docs: Late-breaking Behavior Changes addition for N Preview 5" into nyc-dev
Yuichi Biwa [Tue, 19 Jul 2016 18:33:40 +0000 (18:33 +0000)]
Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
am:
586f23c14b
Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
TreeHugger Robot [Tue, 19 Jul 2016 18:29:09 +0000 (18:29 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 19 Jul 2016 17:58:59 +0000 (17:58 +0000)]
Merge "Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c am:
6e3bbf06a0" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 19 Jul 2016 17:58:33 +0000 (17:58 +0000)]
Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c
am:
6e3bbf06a0
Change-Id: If64fbbcf83910c7f1471470ac3fbbccd9863daa4
Kevin Hufnagle [Tue, 19 Jul 2016 17:57:09 +0000 (17:57 +0000)]
Merge \\"docs: Updated images and content on \\"Google Sign-In\\" page.\\" into nyc-dev am:
c13b84d38c
am:
012d597a92
Change-Id: Ibe16ba5c67137a55cd501434ee3e35e3bba06f3f
Erik Wolsheimer [Tue, 19 Jul 2016 17:57:06 +0000 (17:57 +0000)]
Merge \"Fix a broken case of AndroidKeyStoreProvider error logging\" into nyc-mr1-dev
am:
45b8216d33
Change-Id: I774014fc4922f10a5fd0b23239b0a5710a4f3f3c
Kevin Hufnagle [Tue, 19 Jul 2016 17:53:25 +0000 (17:53 +0000)]
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
am:
c13b84d38c
Change-Id: I61037c2a2aeb7def57d3280555bda39b1d7bb223
Kevin Hufnagle [Tue, 19 Jul 2016 17:52:08 +0000 (17:52 +0000)]
Merge \"docs: Updated images and content on \"Google Sign-In\" page.\" into nyc-dev
am:
c13b84d38c
Change-Id: Ie9b2bc63ebfefe72cc48ba331e28d4792096c48f
ewol [Tue, 19 Jul 2016 17:49:27 +0000 (17:49 +0000)]
Merge "Fix a broken case of AndroidKeyStoreProvider error logging" into nyc-mr1-dev
Kevin Hufnagle [Tue, 19 Jul 2016 17:41:51 +0000 (17:41 +0000)]
Merge "docs: Updated images and content on "Google Sign-In" page." into nyc-dev
Christopher Tate [Tue, 19 Jul 2016 17:37:02 +0000 (17:37 +0000)]
Merge \"Back up wallpapers via staged copies, not hard links\" into nyc-mr1-dev
am:
47f73c4733
Change-Id: Ibfd67eb57fdbd578bb0154498e6fc1ef13738c9c
Chris Tate [Tue, 19 Jul 2016 17:29:31 +0000 (17:29 +0000)]
Merge "Back up wallpapers via staged copies, not hard links" into nyc-mr1-dev
Wei Liu [Tue, 19 Jul 2016 17:22:30 +0000 (17:22 +0000)]
Merge \"Use the Shell app to show the bugreport notification on Wear.\" into nyc-mr1-dev
am:
1dfbf794b5
Change-Id: Ibb3310be1330d238059e4f70aa26763731b19a30
Ruben Brunk [Tue, 19 Jul 2016 17:22:26 +0000 (17:22 +0000)]
Merge \"Return empty set instead of null when user is not set.\" into nyc-mr1-dev
am:
4c724f16af
Change-Id: I10b0c5dce363b16cf89e019d4c1120588fd1a166
Adrian Roos [Tue, 19 Jul 2016 17:22:21 +0000 (17:22 +0000)]
Merge \"AppErrors: Fix bad flags printing in dropbox crash reports\" into nyc-mr1-dev
am:
b4addbc282
Change-Id: If9ac62f69406845f3a204393149510c9fcfa53dc
Wei Liu [Tue, 19 Jul 2016 17:16:22 +0000 (17:16 +0000)]
Merge "Use the Shell app to show the bugreport notification on Wear." into nyc-mr1-dev
Ruben Brunk [Tue, 19 Jul 2016 17:13:41 +0000 (17:13 +0000)]
Merge "Return empty set instead of null when user is not set." into nyc-mr1-dev
Adrian Roos [Tue, 19 Jul 2016 17:10:02 +0000 (17:10 +0000)]
Merge "AppErrors: Fix bad flags printing in dropbox crash reports" into nyc-mr1-dev
Yuichi Biwa [Mon, 30 Nov 2015 05:43:34 +0000 (14:43 +0900)]
ChooserActivity: Cannot start app that the icon overflows the layout
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.
Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.
Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).
Bug:
30153542
Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
Nicolas Prevot [Tue, 19 Jul 2016 16:15:27 +0000 (16:15 +0000)]
Merge \"Don\'t append userIds for the current user\'s clipData uris.\" into nyc-mr1-dev
am:
e723ed8b51
Change-Id: Idf3bf3c6baea706a15df5e68c50d79723a100d9f
Nicolas Prévot [Tue, 19 Jul 2016 16:06:43 +0000 (16:06 +0000)]
Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev
Christopher Wiley [Tue, 19 Jul 2016 16:02:30 +0000 (16:02 +0000)]
Merge \"TetherUtil: Use ConnectivityManager for tethering\" into nyc-mr1-dev
am:
fb0ec9de84
Change-Id: I9a707fdefe40dce1499024375de732515e01bcac
TreeHugger Robot [Tue, 19 Jul 2016 15:55:30 +0000 (15:55 +0000)]
Merge "TetherUtil: Use ConnectivityManager for tethering" into nyc-mr1-dev
Erik Kline [Tue, 19 Jul 2016 15:25:16 +0000 (15:25 +0000)]
Merge \"More correctly close RA daemon socket.\" into nyc-mr1-dev
am:
09d4f4fda4
Change-Id: I69e0bbde197af0e0021ae76c00d730f6b57d19b1
TreeHugger Robot [Tue, 19 Jul 2016 15:20:11 +0000 (15:20 +0000)]
Merge "More correctly close RA daemon socket." into nyc-mr1-dev
Jason Monk [Tue, 19 Jul 2016 14:39:14 +0000 (14:39 +0000)]
Merge \"Neko: Sort the kitties\" into nyc-mr1-dev
am:
7959250318
Change-Id: I80a7aece22ccd29ea8e3fee19f217958da4e1698
Jason Monk [Tue, 19 Jul 2016 14:30:03 +0000 (14:30 +0000)]
Merge "Neko: Sort the kitties" into nyc-mr1-dev
Erik Kline [Tue, 19 Jul 2016 08:37:27 +0000 (17:37 +0900)]
More correctly close RA daemon socket.
Bug:
9580643
Bug:
30190913
Change-Id: I34e34624da09957d96fee38c3f2005e23eb1bee5
Bill Yi [Tue, 19 Jul 2016 09:53:11 +0000 (09:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
862f109dd5 -s ours
Change-Id: If842604b9a7f29fa0896ab1c7921fed6fa4b6990
Bill Yi [Tue, 19 Jul 2016 09:53:07 +0000 (09:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
5fa976b741 -s ours
Change-Id: Ifa08ba7af9b6ffd58c95cdc1bbc40638b8433748
TreeHugger Robot [Tue, 19 Jul 2016 09:46:27 +0000 (09:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 09:45:10 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 19 Jul 2016 06:10:21 +0000 (23:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b32e941e68f7fd5e2fdd3567ac62388b2ae07c8
Auto-generated-cl: translation import
Bill Yi [Tue, 19 Jul 2016 05:55:56 +0000 (22:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifee6c2d6fb55da91f5544c6fe69b233bffc70b4e
Auto-generated-cl: translation import
Kevin Hufnagle [Fri, 1 Jul 2016 00:22:35 +0000 (17:22 -0700)]
docs: Updated images and content on "Google Sign-In" page.
Removed 3 outdated images and replaced with a banner image. Also
updated content layout to fill the page appropriately given new
(single) image.
Bug:
26243119
Change-Id: I4bd71e2a22175ad8fe3bf592e80ff558877f0b11
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
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
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
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
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
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
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
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
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
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
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
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
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
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)
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
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
TreeHugger Robot [Tue, 19 Jul 2016 02:03:53 +0000 (02:03 +0000)]
Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev
TreeHugger Robot [Tue, 19 Jul 2016 02:02:06 +0000 (02:02 +0000)]
Merge "Cleanup TwilightService" into nyc-mr1-dev
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
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
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
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
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
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
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: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
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:
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
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
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
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
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
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
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: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
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
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
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: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
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
OSDN Git Service
