TreeHugger Robot
9324764e9e
Merge "Update test expectations."
2016-06-30 08:08:28 +00:00
Jin Seok Park
943dfc32b9
Merge "ExifInterface: Remove dependency on Piex for DNG Test File"
2016-06-30 06:39:17 +00:00
Tyler Gunn
8ac54f16a9
Merge \\"Add missing setPulling() method in Connection.\\" into nyc-mr1-dev am: 089e99ee4d
...
am: 2251dda76b
2016-06-30 06:35:13 +00:00
TreeHugger Robot
2726f482f1
Merge "AAPT2: Improve diff command"
2016-06-30 06:29:54 +00:00
Tyler Gunn
2251dda76b
Merge \"Add missing setPulling() method in Connection.\" into nyc-mr1-dev
...
am: 089e99ee4d
2016-06-30 06:28:37 +00:00
Tyler Gunn
089e99ee4d
Merge "Add missing setPulling() method in Connection." into nyc-mr1-dev
2016-06-30 06:20:42 +00:00
TreeHugger Robot
4682205151
Merge "[multi-part] Eliminate 1k selection limit"
2016-06-30 06:08:48 +00:00
Seigo Nonaka
1e22227117
Update test expectations.
...
After Ie49b378250, all emoji can be a part of ZWJ sequence, so need to
update the test expectations.
Bug: 29871956
Change-Id: I89ee3e432b6855c86df187cd36c78e9a4e275b79
2016-06-30 15:08:14 +09:00
Jin Park
a59d058e15
ExifInterface: Remove dependency on Piex for DNG Test File
...
This CL removes dependency from Piex for a DNG Test file currently in
ExifInterfaceTest.java.
Specific functions include identifying and setting the byte order of
the data, parsing and saving Exif tags, and retrieving thumbnail
image data and information.
The marker HANDLE_RAW will determine whether to use Piex or not.
Bug: 29409358
Change-Id: I4cd9916ac0c6f294fc44d8b76f52d456aeee8cdc
2016-06-30 15:08:13 +09:00
TreeHugger Robot
a0aaed5da4
Merge "Fix Angler search tests."
2016-06-30 06:07:16 +00:00
Erik Kline
1068384724
Merge \\"Make provisioning timeout apply to both IPv4 and IPv6\\" into nyc-mr1-dev am: ce7ff88bc2
...
am: d2f3c69222
2016-06-30 05:59:11 +00:00
Erik Kline
d2f3c69222
Merge \"Make provisioning timeout apply to both IPv4 and IPv6\" into nyc-mr1-dev
...
am: ce7ff88bc2
2016-06-30 05:49:28 +00:00
TreeHugger Robot
ce7ff88bc2
Merge "Make provisioning timeout apply to both IPv4 and IPv6" into nyc-mr1-dev
2016-06-30 05:41:53 +00:00
Tyler Gunn
c242ceb406
Add missing setPulling() method in Connection.
...
Change-Id: I89c720b2fa3d3e1304766ba3779410b233a04c6a
2016-06-29 22:35:45 -07:00
Jaewan Kim
03bc4b84b6
Merge \\"MediaResourceMonitor: Send broadcast to current users\\" into nyc-mr1-dev am: 7f4f52cb4c
...
am: 60b85827ab
2016-06-30 05:31:58 +00:00
Jaewan Kim
60b85827ab
Merge \"MediaResourceMonitor: Send broadcast to current users\" into nyc-mr1-dev
...
am: 7f4f52cb4c
2016-06-30 05:27:55 +00:00
Jaewan Kim
7f4f52cb4c
Merge "MediaResourceMonitor: Send broadcast to current users" into nyc-mr1-dev
2016-06-30 05:21:27 +00:00
Adam Lesinski
5e8fa3a248
AAPT2: Improve diff command
...
Change-Id: Ia1e2f8482c7192ef50126b61bed7975297332767
2016-06-29 21:56:58 -07:00
TreeHugger Robot
ae33b776b2
Merge "Import translations. DO NOT MERGE"
2016-06-30 04:49:47 +00:00
Steve McKay
38212a4974
Fix Angler search tests.
...
Use a matcher compatible with all devices.
Move constant matchers into respective Bot files.
Suppress testCreateDir test which is failing *ALOT*.
Change-Id: I67d41d54bc36648ed4d7384a046ee4c9c20d753b
2016-06-30 04:23:11 +00:00
Erik Kline
feadfda8a0
Make provisioning timeout apply to both IPv4 and IPv6
...
Bug: 29449295
Change-Id: I743533ca61914c11163ba5c5767a365def3a5461
2016-06-30 13:00:01 +09:00
TreeHugger Robot
d4e80c6a4b
Merge "AAPT2: Add version collapsing"
2016-06-30 03:51:19 +00:00
Bill Yi
4f21575074
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb07b0b372 -s ours am: 847dcc9f4e -s ours\" into nyc-mr1-dev-plus-aosp
...
am: 1e0f58aca5
2016-06-30 03:36:26 +00:00
Bill Yi
806c696b03
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb07b0b372 -s ours am: 791de14f4c -s ours
...
am: 2a99d01323
2016-06-30 03:36:23 +00:00
Android Build Merger (Role)
1e0f58aca5
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours am: 847dcc9f4e -s ours" into nyc-mr1-dev-plus-aosp
2016-06-30 03:30:09 +00:00
Bill Yi
291e6c8107
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c4376b5fae -s ours
...
am: 54e04be817
2016-06-30 03:29:53 +00:00
Bill Yi
cb175b5da8
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 285c920428 -s ours
...
am: 09e2617bd4
2016-06-30 03:29:50 +00:00
Bill Yi
0e5c1144e9
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 8c9d0dbeda -s ours
...
am: 5abcce865e
2016-06-30 03:29:48 +00:00
Bill Yi
4dc11c28bf
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours
...
am: 847dcc9f4e
2016-06-30 03:29:45 +00:00
Bill Yi
2a99d01323
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372 -s ours
...
am: 791de14f4c
2016-06-30 03:28:59 +00:00
Bill Yi
54e04be817
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: c4376b5fae
2016-06-30 03:24:30 +00:00
Bill Yi
09e2617bd4
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 285c920428
2016-06-30 03:24:25 +00:00
Bill Yi
791de14f4c
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: bb07b0b372
2016-06-30 03:23:54 +00:00
Bill Yi
847dcc9f4e
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: bb07b0b372
2016-06-30 03:23:51 +00:00
TreeHugger Robot
810a70cc5a
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:19:48 +00:00
TreeHugger Robot
49818b3f45
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:19:03 +00:00
TreeHugger Robot
aefd1906c1
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:18:43 +00:00
Bill Yi
5abcce865e
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 8c9d0dbeda
2016-06-30 03:18:22 +00:00
TreeHugger Robot
36e53bfa06
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:18:02 +00:00
TreeHugger Robot
c4376b5fae
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-30 03:17:18 +00:00
TreeHugger Robot
285c920428
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-30 03:17:00 +00:00
TreeHugger Robot
bb07b0b372
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-30 03:14:09 +00:00
TreeHugger Robot
8c9d0dbeda
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-30 03:10:09 +00:00
Tyler Gunn
9f7d73be9b
Merge \\"Add conference call label.\\" into nyc-mr1-dev am: 9e0450a4e3
...
am: cb48998883
2016-06-30 02:52:58 +00:00
Tyler Gunn
cb48998883
Merge \"Add conference call label.\" into nyc-mr1-dev
...
am: 9e0450a4e3
2016-06-30 02:46:13 +00:00
Tyler Gunn
9e0450a4e3
Merge "Add conference call label." into nyc-mr1-dev
2016-06-30 02:36:09 +00:00
Dan Albert
07ccf49f7a
Merge \"Merge \\\"Fix Windows NDK labeling.\\\" into nyc-dev am: d1364cf0f1 am: 0ca5ae5208\" into nyc-mr1-dev-plus-aosp
...
am: 4ffaa76089
2016-06-30 02:25:19 +00:00
Dan Albert
ec03aeed40
Merge \\\"Fix Windows NDK labeling.\\\" into nyc-dev am: d1364cf0f1 am: 35b18e4571
...
am: 16647a26f0
2016-06-30 02:19:35 +00:00
Android Build Merger (Role)
4ffaa76089
Merge "Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am: d1364cf0f1 am: 0ca5ae5208" into nyc-mr1-dev-plus-aosp
2016-06-30 02:15:09 +00:00
Dan Albert
d599cd70e2
Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am: d1364cf0f1
...
am: 0ca5ae5208
2016-06-30 02:14:41 +00:00
