Android Build Merger (Role)
|
986134b968
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: a62eff1f94 -s ours am: 80d94130f8 -s ours"
|
2016-12-08 18:27:26 +00:00 |
|
Bill Yi
|
94db4035ae
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: a62eff1f94 -s ours" into nyc-mr2-dev-plus-aosp
am: 1aec82e5ba -s ours
Change-Id: If05e1a79a64a0508175b44b80bafb5da292399ea
|
2016-12-08 18:26:35 +00:00 |
|
Bill Yi
|
2be847d039
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: a62eff1f94 -s ours
am: 80d94130f8 -s ours
Change-Id: Id2204c1c0652979a96d27fe4d90ff606d753fed7
|
2016-12-08 18:26:32 +00:00 |
|
Android Build Merger (Role)
|
cd2a13a52e
|
Merge "Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: 6919758aba -s ours" into nyc-mr2-dev-plus-aosp am: 1290cbde22 -s ours"
|
2016-12-08 18:26:10 +00:00 |
|
Android Build Merger (Role)
|
7532c040d7
|
Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: 6919758aba -s ours am: e4a8541b3e -s ours"
|
2016-12-08 18:25:46 +00:00 |
|
TreeHugger Robot
|
41a0bc55f9
|
Merge "Show popup transitions when there is no anchor set"
|
2016-12-08 18:25:05 +00:00 |
|
Bill Yi
|
e94a6d3969
|
Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: 6919758aba -s ours" into nyc-mr2-dev-plus-aosp
am: 1290cbde22 -s ours
Change-Id: Ic945b09ec5d7101d7a6584964b0c2f555eff4dd9
|
2016-12-08 18:24:54 +00:00 |
|
Bill Yi
|
d7e3493b6a
|
Import translations. DO NOT MERGE am: b004945727 -s ours am: 6919758aba -s ours
am: e4a8541b3e -s ours
Change-Id: Ide0313750ed2a9b532995696a69b93c45474349d
|
2016-12-08 18:24:48 +00:00 |
|
Bill Yi
|
cd234809d3
|
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: 83810d0665 -s ours" into nyc-mr2-dev-plus-aosp
am: c047919893 -s ours
Change-Id: Id379463b11eb082a1a066aa245d618cd1d091178
|
2016-12-08 18:23:07 +00:00 |
|
Bill Yi
|
9098805fb7
|
Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: 83810d0665 -s ours
am: fcb1291179 -s ours
Change-Id: I685b9dee220efb6bcdfa463616603fce4b93074d
|
2016-12-08 18:23:02 +00:00 |
|
Android Build Merger (Role)
|
b08394985c
|
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f0ed05f4b7 -s ours" into nyc-mr2-dev-plus-aosp am: aec40ad476 -s ours"
|
2016-12-08 18:19:54 +00:00 |
|
Android Build Merger (Role)
|
3f8080f1a4
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f0ed05f4b7 -s ours am: d62f14af4c -s ours"
|
2016-12-08 18:19:27 +00:00 |
|
Bill Yi
|
de0aa3de64
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f0ed05f4b7 -s ours" into nyc-mr2-dev-plus-aosp
am: aec40ad476 -s ours
Change-Id: Icce655357b71917ee0fba57568a3fe2a0090c079
|
2016-12-08 18:18:27 +00:00 |
|
Bill Yi
|
3b90d1b243
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f0ed05f4b7 -s ours
am: d62f14af4c -s ours
Change-Id: I70f195db05b67458a77d0f93049f6661cce1076d
|
2016-12-08 18:18:23 +00:00 |
|
Android Build Merger (Role)
|
9c6847223d
|
Merge "Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours" into nyc-mr2-dev-plus-aosp am: 529383ef3b -s ours"
|
2016-12-08 18:18:04 +00:00 |
|
Android Build Merger (Role)
|
96fea9deb9
|
Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours am: 587eb37902 -s ours"
|
2016-12-08 18:17:41 +00:00 |
|
Bill Yi
|
63346d2f0b
|
Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours" into nyc-mr2-dev-plus-aosp
am: 529383ef3b -s ours
Change-Id: Ifd479068f20b3c038f53ae69a69ee83df753f3af
|
2016-12-08 18:16:36 +00:00 |
|
Bill Yi
|
001772e7a1
|
Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours
am: 587eb37902 -s ours
Change-Id: I9d92b3ef136d59f48ab053e0fe8ae82631790d20
|
2016-12-08 18:16:30 +00:00 |
|
Android Build Merger (Role)
|
7d0a6e0e33
|
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours" into nyc-mr2-dev-plus-aosp am: 2231f7a3fc -s ours"
|
2016-12-08 18:16:05 +00:00 |
|
Android Build Merger (Role)
|
4d1caa77d1
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours am: 14052df083 -s ours"
|
2016-12-08 18:15:43 +00:00 |
|
TreeHugger Robot
|
6737226e40
|
Merge "Cleanup and refactoring of test utilities"
|
2016-12-08 18:14:52 +00:00 |
|
Bill Yi
|
2618c64110
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours" into nyc-mr2-dev-plus-aosp
am: 2231f7a3fc -s ours
Change-Id: I0c61d63dbf099dc53e6047811c4f9a9cfd95b8d8
|
2016-12-08 18:14:50 +00:00 |
|
Bill Yi
|
dff4fc979e
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours
am: 14052df083 -s ours
Change-Id: I1f8cadbbccd9f64d392e3e961e245d535dae48aa
|
2016-12-08 18:14:46 +00:00 |
|
Android Build Merger (Role)
|
3d4862a8b8
|
Merge "Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours" into nyc-mr2-dev-plus-aosp am: 5a8f26382f -s ours"
|
2016-12-08 18:14:25 +00:00 |
|
Android Build Merger (Role)
|
5f4733e0e8
|
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours am: 174ba61ad9 -s ours"
|
2016-12-08 18:14:00 +00:00 |
|
Bill Yi
|
b228297f3b
|
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours" into nyc-mr2-dev-plus-aosp
am: 5a8f26382f -s ours
Change-Id: I709c97bb029ee6022795cfe1e53f8e8fdfe00832
|
2016-12-08 18:12:53 +00:00 |
|
Bill Yi
|
5806d99d1e
|
Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours
am: 174ba61ad9 -s ours
Change-Id: I1d86bd81943c7cb88f319e2baaf4d194d9cbfc98
|
2016-12-08 18:12:47 +00:00 |
|
Android Build Merger (Role)
|
2a58fbc1fd
|
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: 217e5fc476 -s ours" into nyc-mr2-dev-plus-aosp am: 738dddae72 -s ours"
|
2016-12-08 18:12:22 +00:00 |
|
Android Build Merger (Role)
|
2b416b475d
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: 217e5fc476 -s ours am: 237b2c3d55 -s ours"
|
2016-12-08 18:11:55 +00:00 |
|
Bill Yi
|
7130750095
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: 217e5fc476 -s ours" into nyc-mr2-dev-plus-aosp
am: 738dddae72 -s ours
Change-Id: I4f11dd3bd2d96ace6c01409d9d6f8efc2fd2501c
|
2016-12-08 18:10:57 +00:00 |
|
Bill Yi
|
7a0d04d389
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: 217e5fc476 -s ours
am: 237b2c3d55 -s ours
Change-Id: If1315acb1eef0fc6f59d1e1e5c442de1f82b6de8
|
2016-12-08 18:10:53 +00:00 |
|
Android Build Merger (Role)
|
e3c6836afc
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: ceb0716eba -s ours am: 8daef56a1c -s ours"
|
2016-12-08 18:10:32 +00:00 |
|
Bill Yi
|
fa9ede181a
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: ceb0716eba -s ours
am: 8daef56a1c -s ours
Change-Id: I486f5eeefc3dc59d30345f07522daa0b8e094c27
|
2016-12-08 18:09:33 +00:00 |
|
Android Build Merger (Role)
|
66d049d3c0
|
Merge "Import translations. DO NOT MERGE am: ef89f62670 -s ours am: 42318626f2 -s ours am: 5966efe1cd -s ours"
|
2016-12-08 18:09:14 +00:00 |
|
Bill Yi
|
1d1104b233
|
Import translations. DO NOT MERGE am: ef89f62670 -s ours am: 42318626f2 -s ours
am: 5966efe1cd -s ours
Change-Id: I03426e47c43aee74e4b5841834c4b49560523198
|
2016-12-08 18:08:21 +00:00 |
|
Android Build Merger (Role)
|
5438fbba30
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours am: f7a5a3b0ce -s ours am: 42c2cbf5c3 -s ours"
|
2016-12-08 18:08:05 +00:00 |
|
Bill Yi
|
c86306fdb8
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours am: f7a5a3b0ce -s ours
am: 42c2cbf5c3 -s ours
Change-Id: Ie4fc90f18a3097620882416690489093f0087489
|
2016-12-08 18:07:01 +00:00 |
|
Android Build Merger (Role)
|
e4283c67b8
|
Merge "Import translations. DO NOT MERGE am: d4bdbc314b -s ours am: d47bc2f25c -s ours am: ec97386557 -s ours"
|
2016-12-08 18:06:43 +00:00 |
|
Bill Yi
|
b0142009fc
|
Import translations. DO NOT MERGE am: d4bdbc314b -s ours am: d47bc2f25c -s ours
am: ec97386557 -s ours
Change-Id: I48013c9389dff6dbd1f7b0f8f7357b701f230aad
|
2016-12-08 18:05:32 +00:00 |
|
Android Build Merger (Role)
|
13eb74620f
|
Merge "Import translations. DO NOT MERGE am: ef89f62670 -s ours am: ec82e05e7b -s ours am: 0c985d8957 -s ours"
|
2016-12-08 18:05:14 +00:00 |
|
Bill Yi
|
cbf107bf4d
|
Import translations. DO NOT MERGE am: ef89f62670 -s ours am: ec82e05e7b -s ours
am: 0c985d8957 -s ours
Change-Id: Id719962ffcb49f4e5651d63ca086152223e4d1f1
|
2016-12-08 18:04:14 +00:00 |
|
Android Build Merger (Role)
|
c4705dcebe
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours am: 19e2b518ff -s ours am: 237edac526 -s ours"
|
2016-12-08 18:03:57 +00:00 |
|
Bill Yi
|
9c1cc35df9
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours am: 19e2b518ff -s ours
am: 237edac526 -s ours
Change-Id: I5c970c067c94ae4f3636ff189d6b08cc5b7efbb6
|
2016-12-08 18:02:50 +00:00 |
|
Android Build Merger (Role)
|
1cf1b0efa3
|
Merge "Import translations. DO NOT MERGE am: d4bdbc314b -s ours am: c52c508e8c -s ours am: ec69ea62ad -s ours"
|
2016-12-08 18:02:34 +00:00 |
|
Bill Yi
|
8b07a68abf
|
Import translations. DO NOT MERGE am: d4bdbc314b -s ours am: c52c508e8c -s ours
am: ec69ea62ad -s ours
Change-Id: I9b64efce8bf35c0ff93bd1c42da8c527232f0d96
|
2016-12-08 18:01:32 +00:00 |
|
Android Build Merger (Role)
|
fccade9ce9
|
Merge changes from topic 'am-53ce40f4d4244f45b19662f27574d289'
* changes:
Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd am: 0a7f2d076d am: 9aa93df2b4 am: 256d5cd65f
DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15 -s ours am: a8b73b23d6 -s ours am: ce10ba98bf am: 4e7b5c25d8 -s ours
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e -s ours am: 2a2e22ab23 -s ours am: a053ead6a9 am: 8cc63f2554 -s ours
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1 -s ours am: efd928fe56 -s ours am: 5cf18abca9 am: fb636d1faa -s ours
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950a0 -s ours am: d1e22a3f07 -s ours am: 4c4a86fd4d am: 3cf39b018c -s ours
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5 -s ours am: bcb7e32954 -s ours am: eb7b7664cb am: 77852d0a9f -s ours
DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e413 -s ours am: a84ede299c -s ours am: 33b238bd42 am: 0c34c32534 -s ours
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d1410 -s ours am: e47b0886ad -s ours am: 412e89fe9f am: 80587a02cc -s ours
DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14 -s ours am: 8006bd5c66 -s ours am: 573880a198 am: c39a37c0d6 -s ours
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea11 -s ours am: d063978acf -s ours am: 9c37634688 am: 52587963ca -s ours
DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd -s ours am: eb98bc95d2 -s ours am: a63d5e5fd8 am: 9a686a26c6 -s ours
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff9220 -s ours am: 2889968553 -s ours am: 02f1650458 am: eaf63414bf -s ours
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d82 -s ours am: 976ef7538a -s ours am: 046c5a3119 am: 796a0babf9 -s ours
DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d0a -s ours am: eb6be2c826 -s ours am: e8dda0f7e4 am: cea7843c61 -s ours
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb79 -s ours am: 8a73b2896d -s ours am: a8500b7efc am: 59d46341c8 -s ours
|
2016-12-08 18:00:35 +00:00 |
|
Lei Yu
|
d81a26353e
|
Merge "Remove qs_tile_text and qs_dual_tile_caret"
|
2016-12-08 17:58:12 +00:00 |
|
TreeHugger Robot
|
14dc13a8ad
|
Merge "Don't return null in WS.getTopParentWindow on child detach"
|
2016-12-08 17:54:17 +00:00 |
|
Lorenzo Colitti
|
e36404148e
|
Merge changes from topic 'framework-net-aosp' am: b92aa5bdfd am: 0a7f2d076d am: 9aa93df2b4
am: 256d5cd65f
Change-Id: I6f9cc778c333e6c8042d5630178844a0330504a5
|
2016-12-08 17:54:02 +00:00 |
|
Etan Cohen
|
992e66a723
|
DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad15 -s ours am: a8b73b23d6 -s ours am: ce10ba98bf
am: 4e7b5c25d8 -s ours
Change-Id: I1919ee28071c2281896a2f7fbb3d6aadf4f47cae
|
2016-12-08 17:53:04 +00:00 |
|