Commit Graph

274545 Commits

Author SHA1 Message Date
TreeHugger Robot
c1b775584d Merge "Remove synchronized from static methods in WebView." 2016-07-19 11:42:01 +00:00
Bill Yi
16560f6eb9 Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 862f109dd5 -s ours
am: fd1e142b8a  -s ours

Change-Id: I040d0eeca401f1801396a160ce4bbd5a35b831d0
2016-07-19 10:01:45 +00:00
Bill Yi
1fc7a9af35 Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5fa976b741 -s ours
am: 627c44ae87  -s ours

Change-Id: I144a3b1d2c310b0d24b297d7850f4f243675b293
2016-07-19 10:01:42 +00:00
Bill Yi
fd1e142b8a Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 862f109dd5  -s ours

Change-Id: If842604b9a7f29fa0896ab1c7921fed6fa4b6990
2016-07-19 09:53:11 +00:00
Bill Yi
627c44ae87 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5fa976b741  -s ours

Change-Id: Ifa08ba7af9b6ffd58c95cdc1bbc40638b8433748
2016-07-19 09:53:07 +00:00
TreeHugger Robot
e03a9ce668 Merge "Import translations. DO NOT MERGE" 2016-07-19 09:48:37 +00:00
TreeHugger Robot
0a03a741db Merge "Import translations. DO NOT MERGE" 2016-07-19 09:48:28 +00:00
TreeHugger Robot
916687061c Merge "Import translations. DO NOT MERGE" 2016-07-19 09:48:09 +00:00
TreeHugger Robot
862f109dd5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-19 09:46:29 +00:00
TreeHugger Robot
5fa976b741 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-19 09:45:11 +00:00
TreeHugger Robot
59ec49dffb Merge "Fix NullPointerException in MtpManager." 2016-07-19 08:11:58 +00:00
Daichi Hirono
28e6112e2f Fix NullPointerException in MtpManager.
BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
2016-07-19 15:48:04 +09:00
Bill Yi
df7834e62e Import translations. DO NOT MERGE
Change-Id: I1b32e941e68f7fd5e2fdd3567ac62388b2ae07c8
Auto-generated-cl: translation import
2016-07-18 23:10:21 -07:00
Bill Yi
8a5f5a5bf5 Import translations. DO NOT MERGE
Change-Id: Ifee6c2d6fb55da91f5544c6fe69b233bffc70b4e
Auto-generated-cl: translation import
2016-07-18 22:55:56 -07:00
TreeHugger Robot
4ce896ca7a Merge "Added foundation for supporting unit tests in WindowManager" 2016-07-19 05:22:25 +00:00
Bill Yi
d2de401ba9 Import translations. DO NOT MERGE
Change-Id: I7bbdd7a9064b731c899989b4e0055e6e9325bd86
Auto-generated-cl: translation import
2016-07-18 21:34:02 -07:00
Bill Yi
3edda82c5a Import translations. DO NOT MERGE
Change-Id: I16701ceb77a258a903a0d6515b1f2bcf3c55b595
Auto-generated-cl: translation import
2016-07-18 20:51:26 -07:00
Bill Yi
bbded2eef1 Import translations. DO NOT MERGE
Change-Id: I3764b750a2d565eb048b11ac86ee37ab80e77820
Auto-generated-cl: translation import
2016-07-18 20:39:21 -07:00
Kevin Hufnagle
0506f45b32 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
2016-07-19 03:23:52 +00:00
Kevin Hufnagle
18cb288358 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
2016-07-19 03:23:49 +00:00
Kevin Hufnagle
55c72343ac 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
2016-07-19 03:23:45 +00:00
Kevin Hufnagle
1e7ea63a0d Merge \\\"docs: Edited phrasing for \\\"orderId is blank with test IAP purchases\\\"\\\" into nyc-dev am: e25fd0eda8 am: eb2835329f
am: ee1172bfb7

Change-Id: I8fa71bdedc3dff2b01dcfa3238fd3265f7552baa
2016-07-19 03:23:41 +00:00
Android Build Merger (Role)
2b8d021d3a Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e am: 8cb020227d" into nyc-mr1-dev-plus-aosp 2016-07-19 03:19:38 +00:00
Android Build Merger (Role)
413dd5f8c7 Merge "Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e am: aa63aab59e" into nyc-mr1-dev-plus-aosp 2016-07-19 03:19:29 +00:00
Android Build Merger (Role)
0bf9f0251d 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 2016-07-19 03:19:22 +00:00
Kevin Hufnagle
35b7231761 Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e
am: 8cb020227d

Change-Id: Iac30188cb146eb77eae58663b7fde74d68fdf6f9
2016-07-19 03:18:39 +00:00
Kevin Hufnagle
ae8b09f70a Merge \\"docs: Added metadata to display AdMob Udacity resource card\\" into nyc-dev am: b79aac7a0e
am: aa63aab59e

Change-Id: I822dbc5660e102156be19b5f59ba846dd2bc3078
2016-07-19 03:18:36 +00:00
Kevin Hufnagle
72a120440e Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am: e25fd0eda8
am: 0ff26ec64e

Change-Id: I3199ac3b1b2a41c3a0c399033bb6bbd5188b18da
2016-07-19 03:18:34 +00:00
Kevin Hufnagle
ee1172bfb7 Merge \\"docs: Edited phrasing for \\"orderId is blank with test IAP purchases\\"\\" into nyc-dev am: e25fd0eda8
am: eb2835329f

Change-Id: I3d70763a6370a138e069fd1b17687b29d070e5ba
2016-07-19 03:18:33 +00:00
Kevin Hufnagle
aa63aab59e Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am: b79aac7a0e

Change-Id: If2e96ea7656a43a2f568f599378d1ae74fb25f0a
2016-07-19 03:13:27 +00:00
Kevin Hufnagle
eb2835329f Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am: e25fd0eda8

Change-Id: Ia4152d80b5701c5108aec6f399d4d97a3ef98473
2016-07-19 03:13:18 +00:00
Kevin Hufnagle
8cb020227d Merge \"docs: Added metadata to display AdMob Udacity resource card\" into nyc-dev
am: b79aac7a0e

Change-Id: I9b41c494aa7d26f60a6856ddf877faf127dc70e8
2016-07-19 03:13:10 +00:00
Eino-Ville Talvala
cba65385ca Fix build: Remove unused debug flag
am: 27f2a0ffe9

Change-Id: I0cb5fe7e6f9c98b732cbb7e4f482b637c6c304d5
2016-07-19 03:13:10 +00:00
Kevin Hufnagle
0ff26ec64e Merge \"docs: Edited phrasing for \"orderId is blank with test IAP purchases\"\" into nyc-dev
am: e25fd0eda8

Change-Id: I0e3d131c0c0a259201fed4aa0209231a5cec000e
2016-07-19 03:13:08 +00:00
Kevin Hufnagle
b79aac7a0e Merge "docs: Added metadata to display AdMob Udacity resource card" into nyc-dev 2016-07-19 03:05:36 +00:00
Kevin Hufnagle
e25fd0eda8 Merge "docs: Edited phrasing for "orderId is blank with test IAP purchases"" into nyc-dev 2016-07-19 03:05:09 +00:00
Eino-Ville Talvala
27f2a0ffe9 Fix build: Remove unused debug flag
Change-Id: I929df7018aba8ac7677aa30c17bd842599697ac7
(cherry picked from commit bc0580db5f)
2016-07-19 03:04:56 +00:00
Andrew Sapperstein
dfdf82df19 Merge \\"Update bugreport dialog to DeviceDefault theme.\\" into nyc-mr1-dev am: 878bd5103e
am: b88c3801ea

Change-Id: Ice3e4ed8a3188d62f9f92b034ca07dcc693c22b8
2016-07-19 02:16:29 +00:00
Justin Klaassen
3fac1a8c5c Merge \\"Cleanup TwilightService\\" into nyc-mr1-dev am: e5aeca3dc9
am: 6c02076e73

Change-Id: Ib3aad9f409c01338ce9be5d433db55d87d511daf
2016-07-19 02:16:25 +00:00
Andrew Sapperstein
b88c3801ea Merge \"Update bugreport dialog to DeviceDefault theme.\" into nyc-mr1-dev
am: 878bd5103e

Change-Id: I918da483da287b36f49b103a5823f5ca81b2f4c0
2016-07-19 02:11:05 +00:00
Justin Klaassen
6c02076e73 Merge \"Cleanup TwilightService\" into nyc-mr1-dev
am: e5aeca3dc9

Change-Id: Iac61d988c3432b8f78eb7d06dd3bb8d706fec621
2016-07-19 02:11:00 +00:00
TreeHugger Robot
878bd5103e Merge "Update bugreport dialog to DeviceDefault theme." into nyc-mr1-dev 2016-07-19 02:03:55 +00:00
TreeHugger Robot
e5aeca3dc9 Merge "Cleanup TwilightService" into nyc-mr1-dev 2016-07-19 02:02:07 +00:00
Sungsoo Lim
a8714a48f7 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
2016-07-19 01:58:11 +00:00
Sungsoo Lim
f2aa92e2e3 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
2016-07-19 01:58:08 +00:00
Android Build Merger (Role)
5dfda0c426 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 2016-07-19 01:53:16 +00:00
Sungsoo Lim
568b89626b 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
2016-07-19 01:52:43 +00:00
Sungsoo Lim
5df700ba3e 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
2016-07-19 01:52:37 +00:00
Sungsoo Lim
d7b6fdcbfe 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
2016-07-19 01:52:19 +00:00
Sungsoo Lim
f692d5b182 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
2016-07-19 01:52:13 +00:00