OSDN Git Service
Diego Perez [Tue, 19 Jul 2016 15:41:27 +0000 (15:41 +0000)]
Merge "Add drawable caching"
Diego Perez [Tue, 19 Jul 2016 15:40:52 +0000 (15:40 +0000)]
Merge "Add support for appcompat preferences rendering"
Diego Perez [Tue, 19 Jul 2016 15:40:35 +0000 (15:40 +0000)]
Merge "Fix leak in VPathRenderer"
Erik Kline [Tue, 19 Jul 2016 15:30:49 +0000 (15:30 +0000)]
Merge \\"More correctly close RA daemon socket.\\" into nyc-mr1-dev am:
09d4f4fda4
am:
ec2748e316
Change-Id: I83a33ae546003fb3fe76f7ad9fe251f188ed00ba
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:46:36 +0000 (14:46 +0000)]
Merge \\"Neko: Sort the kitties\\" into nyc-mr1-dev am:
7959250318
am:
fafc4a768f
Change-Id: I01d827e0d824990680e45f5370e2dee9fbe965ba
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
Bill Yi [Tue, 19 Jul 2016 13:57:46 +0000 (13:57 +0000)]
Merge "Import translations. DO NOT MERGE"
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
TreeHugger Robot [Tue, 19 Jul 2016 11:42:00 +0000 (11:42 +0000)]
Merge "Remove synchronized from static methods in WebView."
Diego Perez [Fri, 24 Jun 2016 16:01:59 +0000 (17:01 +0100)]
Add drawable caching
Change-Id: I4de4b55c1eddfd43e53ead27e2a284a4c18cb3cb
(cherry picked from commit
b0ee962da6fe994db45e2a8221896ab67c2604be)
Diego Perez [Mon, 16 May 2016 18:06:29 +0000 (19:06 +0100)]
Add support for appcompat preferences rendering
This CL adds new code to handle the support preferences classes. If the
support library is not installed in the project, it will use the regular
inflater as fallback.
This also ports the hotfix that used to live in Android Studio to
support "*Compat" preferences to the regular BridgePreferenceInflater.
Change-Id: I8ff34455d46b6188f0931e821d329224f6a0a343
(cherry picked from commit
90110d50f4c48ea7ec196a068f55b0eb86114c46)
Diego Perez [Tue, 14 Jun 2016 16:50:45 +0000 (17:50 +0100)]
Fix leak in VPathRenderer
The pointer to the root group in the VPathRenderer is not freed anywhere
in the Java side so we need to take care of it on the "native" side.
Change-Id: I2ca60b1f0e975a0b5d29799c5f6f31b5f8d42b9d
(cherry picked from commit
ffdb1b241d9458196403c8f16264aa7053487323)
Bill Yi [Tue, 19 Jul 2016 10:01:45 +0000 (10:01 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
862f109dd5 -s ours
am:
fd1e142b8a -s ours
Change-Id: I040d0eeca401f1801396a160ce4bbd5a35b831d0
Bill Yi [Tue, 19 Jul 2016 10:01:42 +0000 (10:01 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
5fa976b741 -s ours
am:
627c44ae87 -s ours
Change-Id: I144a3b1d2c310b0d24b297d7850f4f243675b293
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:48:36 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 19 Jul 2016 09:48:26 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 19 Jul 2016 09:48:08 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE"
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
TreeHugger Robot [Tue, 19 Jul 2016 08:11:57 +0000 (08:11 +0000)]
Merge "Fix NullPointerException in MtpManager."
Daichi Hirono [Tue, 19 Jul 2016 06:48:04 +0000 (15:48 +0900)]
Fix NullPointerException in MtpManager.
BUG=
30152892
Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
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
TreeHugger Robot [Tue, 19 Jul 2016 05:22:24 +0000 (05:22 +0000)]
Merge "Added foundation for supporting unit tests in WindowManager"
Bill Yi [Tue, 19 Jul 2016 04:34:02 +0000 (21:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7bbdd7a9064b731c899989b4e0055e6e9325bd86
Auto-generated-cl: translation import
Bill Yi [Tue, 19 Jul 2016 03:51:26 +0000 (20:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I16701ceb77a258a903a0d6515b1f2bcf3c55b595
Auto-generated-cl: translation import
Bill Yi [Tue, 19 Jul 2016 03:39:21 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3764b750a2d565eb048b11ac86ee37ab80e77820
Auto-generated-cl: translation import
Kevin Hufnagle [Tue, 19 Jul 2016 03:23:52 +0000 (03:23 +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
am:
2b8d021d3a
Change-Id: I9b6781783728d03b3f56dbd23982a3c2078bd89f
Kevin Hufnagle [Tue, 19 Jul 2016 03:23:49 +0000 (03:23 +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
am:
413dd5f8c7
Change-Id: I85069420bb85877784a8e4d2f83b2bdc677b4abb
Kevin Hufnagle [Tue, 19 Jul 2016 03:23:45 +0000 (03:23 +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
am:
0bf9f0251d
Change-Id: Ia23f4ae5946b8fadb1d7d5e82955e609a84c25af
Kevin Hufnagle [Tue, 19 Jul 2016 03:23:41 +0000 (03:23 +0000)]
Merge \\\"docs: Edited phrasing for \\\"orderId is blank with test IAP purchases\\\"\\\" into nyc-dev am:
e25fd0eda8 am:
eb2835329f
am:
ee1172bfb7
Change-Id: I8fa71bdedc3dff2b01dcfa3238fd3265f7552baa
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
Eino-Ville Talvala [Tue, 19 Jul 2016 03:13:10 +0000 (03:13 +0000)]
Fix build: Remove unused debug flag
am:
27f2a0ffe9
Change-Id: I0cb5fe7e6f9c98b732cbb7e4f482b637c6c304d5
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:16:29 +0000 (02:16 +0000)]
Merge \\"Update bugreport dialog to DeviceDefault theme.\\" into nyc-mr1-dev am:
878bd5103e
am:
b88c3801ea
Change-Id: Ice3e4ed8a3188d62f9f92b034ca07dcc693c22b8
Justin Klaassen [Tue, 19 Jul 2016 02:16:25 +0000 (02:16 +0000)]
Merge \\"Cleanup TwilightService\\" into nyc-mr1-dev am:
e5aeca3dc9
am:
6c02076e73
Change-Id: Ib3aad9f409c01338ce9be5d433db55d87d511daf
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
Sungsoo Lim [Tue, 19 Jul 2016 01:58:11 +0000 (01:58 +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
am:
5dfda0c426 -s ours
Change-Id: Ie3adc5300d2fc6eb26c3dde104d8462eba7443ed
Sungsoo Lim [Tue, 19 Jul 2016 01:58:08 +0000 (01:58 +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
am:
5df700ba3e -s ours
Change-Id: I0abff5e7f21a65ef941242280d2dc1349b55875c
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:52:19 +0000 (01:52 +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
am:
e889c1daf6 -s ours
Change-Id: Ifd37b6e57f28c33b4d34f305f792c815d5a5ac03
Sungsoo Lim [Tue, 19 Jul 2016 01:52:13 +0000 (01:52 +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
am:
a5b47a45ea -s ours
Change-Id: If643c18539b14a3d01088fa08a229a4aebac7dcd
Sungsoo Lim [Tue, 19 Jul 2016 01:52:07 +0000 (01:52 +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
am:
8874d1a93d -s ours
Change-Id: Ia5f9ec4e86edb9245863919ba31cb7e100c2c508
Adam Lesinski [Tue, 19 Jul 2016 01:52:01 +0000 (01:52 +0000)]
Merge \\"AAPT: Don\\'t keep processing files that failed to be added\\" into nyc-mr1-dev am:
d94f55552f
am:
28250b6009
Change-Id: Ibdc265278fea76d4d8a7ac478a80ffdcd827fd16
Sungsoo Lim [Tue, 19 Jul 2016 01:51:51 +0000 (01:51 +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
am:
622d3577ca -s ours
Change-Id: Idaa6a05f7fc6462040f5fe8f9a43944159543531
Wale Ogunwale [Mon, 18 Jul 2016 19:05:30 +0000 (12:05 -0700)]
Added foundation for supporting unit tests in WindowManager
- Check for null where appropriate when using WM from a test
- Inject WindowManagerPolicy for test can have its own policy
- Added skeleton for WindowStateTests that will contain tests
for WindowState class.
Bug:
30060889
Change-Id: I0cd7d50c98de16c7412759401075c4bb48d13dfe
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
Mark Lu [Tue, 19 Jul 2016 01:35:42 +0000 (01:35 +0000)]
Merge \"Merge \\\"docs: Fixed indentation for android:required attribute\\\" into nyc-dev am:
831ea9e190 am:
bf441b392b\" into nyc-mr1-dev-plus-aosp
am:
6d6ff72ab8
Change-Id: I26b16378511a316bc99d58f92ae7d787a43b7a92
Mark Lu [Tue, 19 Jul 2016 01:35:40 +0000 (01:35 +0000)]
Merge \"Merge \\\"docs: fix typo error in class name\\\" into nyc-dev am:
35d61e4117 am:
9d7d33a407\" into nyc-mr1-dev-plus-aosp
am:
d5dfcf3a43
Change-Id: Ib974eff7890873c4f10a47080d12d8e090668383
Sungsoo Lim [Tue, 19 Jul 2016 01:35:36 +0000 (01:35 +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
am:
6af22c7ec3 -s ours
Change-Id: Ib228aba8dac071f674a2f528850bb76d2ee2982e
Mark Lu [Tue, 19 Jul 2016 01:35:34 +0000 (01:35 +0000)]
Merge \\\"docs: Fixed indentation for android:required attribute\\\" into nyc-dev am:
831ea9e190 am:
d88928aaf5
am:
f02c643623
Change-Id: I7e82c65b9c358e0b51c5df709c65ff1a966f9f32
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
Mark Lu [Tue, 19 Jul 2016 01:35:30 +0000 (01:35 +0000)]
Merge \\\"docs: fix typo error in class name\\\" into nyc-dev am:
35d61e4117 am:
2025a23bcb
am:
14d0e9791f
Change-Id: I88f4c3bcf0900409b312008bb49eb2edf802e3d9
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
OSDN Git Service
