OSDN Git Service
Svet Ganov [Tue, 27 Sep 2016 20:59:00 +0000 (20:59 +0000)]
[DO NOT MERGE] Use tokens instead of account access trackers am:
32bfb594af
am:
18b725ac0a
Change-Id: I8f90fb4c4d4baa29727d84a28db68f277d305a74
Andrew Solovay [Tue, 27 Sep 2016 20:58:08 +0000 (20:58 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am:
156d5fd88e am:
af089036be am:
f52c849083
am:
36c387ab74
Change-Id: I7cedbf9b412be162f451be4dc3cbdedab5e7aef7
Andrew Solovay [Tue, 27 Sep 2016 20:57:09 +0000 (20:57 +0000)]
docs: Redirect for /preview/setup-sdk.html am:
572d710ba3 am:
a56c8c79d8 am:
61212ec382
am:
f26df79b7c
Change-Id: Ib8df7e511e0171331a1b7042cf21d1d55b226bc6
Svet Ganov [Tue, 27 Sep 2016 20:51:28 +0000 (20:51 +0000)]
[DO NOT MERGE] Use tokens instead of account access trackers
am:
32bfb594af
Change-Id: I1706ecca7b3b98a2a38483545270941ce8899939
Andrew Solovay [Tue, 27 Sep 2016 20:50:37 +0000 (20:50 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am:
156d5fd88e am:
af089036be
am:
f52c849083
Change-Id: I3eb721e9e5e6bec1faaa0c09977e638e2bba60e1
Andrew Solovay [Tue, 27 Sep 2016 20:49:48 +0000 (20:49 +0000)]
docs: Redirect for /preview/setup-sdk.html am:
572d710ba3 am:
a56c8c79d8
am:
61212ec382
Change-Id: I7f90924db750cb346a26b9f3b68ee5079d191c99
Andrew Solovay [Tue, 27 Sep 2016 20:47:24 +0000 (20:47 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am:
156d5fd88e
am:
3e8cf83163
Change-Id: Id75022f9e9b94255d62c44a62a1a7fbba725928d
Andrew Solovay [Tue, 27 Sep 2016 20:46:35 +0000 (20:46 +0000)]
docs: Redirect for /preview/setup-sdk.html am:
572d710ba3
am:
87460c5325
Change-Id: I671dafa35c107fc76623ab333de8d6cd2e5a424f
Andrew Solovay [Tue, 27 Sep 2016 20:45:00 +0000 (20:45 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev am:
156d5fd88e
am:
af089036be
Change-Id: Ie457b30f25fed45232f044206e5fe356ad6e6cfc
Andrew Solovay [Tue, 27 Sep 2016 20:44:06 +0000 (20:44 +0000)]
docs: Redirect for /preview/setup-sdk.html am:
572d710ba3
am:
a56c8c79d8
Change-Id: Id966ed24a5aa6cf3a7dc7f30a6c49a559cbb39ca
Andrew Solovay [Tue, 27 Sep 2016 20:41:16 +0000 (20:41 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev
am:
156d5fd88e
Change-Id: Ied7f37838c2ecb2b71348c99de36bf8764063731
Andrew Solovay [Tue, 27 Sep 2016 20:41:12 +0000 (20:41 +0000)]
docs: Redirect for /preview/setup-sdk.html
am:
572d710ba3
Change-Id: I49f154e21a0f3e74a709755ce8f3bd77adba159a
Andrew Solovay [Tue, 27 Sep 2016 20:39:09 +0000 (20:39 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev
am:
156d5fd88e
Change-Id: I86e1d6be64864a21ac27cd321633691541c447b6
Andrew Solovay [Tue, 27 Sep 2016 20:39:07 +0000 (20:39 +0000)]
docs: Redirect for /preview/setup-sdk.html
am:
572d710ba3
Change-Id: I5cbe45b1c45001f7f3a68565430dea060a0e1741
Andrew Solovay [Tue, 27 Sep 2016 20:31:45 +0000 (20:31 +0000)]
Merge "docs: Redirect for /preview/setup-sdk.html" into nyc-dev
Etan Cohen [Tue, 27 Sep 2016 20:12:33 +0000 (20:12 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am:
5d74bf9f95 am:
62be010f2a
am:
fb43e8509b
Change-Id: Icba27b160eaf410d79605b49f6e3e566403c41e0
Etan Cohen [Tue, 27 Sep 2016 20:06:56 +0000 (20:06 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am:
5d74bf9f95
am:
62be010f2a
Change-Id: I9354e65db8144c01bfbe748f3661f633d5a06c70
Etan Cohen [Tue, 27 Sep 2016 20:02:00 +0000 (20:02 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
am:
5d74bf9f95
Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673
Etan Cohen [Tue, 27 Sep 2016 19:50:43 +0000 (19:50 +0000)]
Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
Adrian Roos [Tue, 27 Sep 2016 19:30:45 +0000 (19:30 +0000)]
Merge changes from topic 'am-
e324dcd33e36478aab5aff580c25af58' into cw-f-dev
am:
436569bea2
Change-Id: Ibbceafbae2332f244ba9b1bfe33e4ac3322de871
Adrian Roos [Tue, 27 Sep 2016 19:30:39 +0000 (19:30 +0000)]
Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev am:
afae61eae7
am:
44ea155244
Change-Id: I54fec91a63fea8a07871ca44bd014ad842e34d94
Adrian Roos [Tue, 27 Sep 2016 19:29:36 +0000 (19:29 +0000)]
DozeService: Seperate double tap and pickup am:
7294c115fd
am:
5c442350f7
Change-Id: I3f39f5d2e910f7aaa865e84aea0b8f6e6e8fce66
Adrian Roos [Tue, 27 Sep 2016 19:23:31 +0000 (19:23 +0000)]
DozeService: Seperate double tap and pickup am:
7294c115fd
am:
9589dca308
Change-Id: Ia3c761aa1b93d7d5d525e59e5ac18c41d069ed44
Android Build Merger (Role) [Tue, 27 Sep 2016 19:20:28 +0000 (19:20 +0000)]
Merge changes from topic 'am-
e324dcd33e36478aab5aff580c25af58' into cw-f-dev
* changes:
Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev am:
afae61eae7
DozeService: Seperate double tap and pickup am:
7294c115fd
Adrian Roos [Tue, 27 Sep 2016 19:19:33 +0000 (19:19 +0000)]
Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev
am:
afae61eae7
Change-Id: I08b46cc5866a71fb9ec5b100c21da10f14ecf835
Adrian Roos [Tue, 27 Sep 2016 19:19:30 +0000 (19:19 +0000)]
DozeService: Seperate double tap and pickup
am:
7294c115fd
Change-Id: Ic92245eb6fbf13c4aa129570764fcc7e538d9b3c
Adrian Roos [Tue, 27 Sep 2016 19:17:09 +0000 (19:17 +0000)]
DozeService: Seperate double tap and pickup
am:
7294c115fd
Change-Id: I47fd20b374a188d7e280d1c6867204ee06733d0e
TreeHugger Robot [Tue, 27 Sep 2016 19:09:20 +0000 (19:09 +0000)]
Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev
Adrian Roos [Tue, 20 Sep 2016 21:03:21 +0000 (14:03 -0700)]
DozeService: Seperate double tap and pickup
Adds handling for a separate double tap gesture
and allows enabling double tap and pickup
individually.
Test: Turn screen off, toggle gestures with `adb shell settings put secure doze_pulse_on_pick_up 0/1` and `adb shell settings put secure doze_pulse_on_double_tap 0/1`
Bug:
30595437
Change-Id: Id7b79f90b28429cf321544a3e425cf33c575d1c3
Etan Cohen [Tue, 27 Sep 2016 16:51:37 +0000 (09:51 -0700)]
[NAN] Rename setTerminateNotificationEnabled per API review
(cherry-pick of commit
7df9b7a1039ea8e34e82e650cebd1025a2591580)
Bug:
31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f
Scott Main [Tue, 27 Sep 2016 17:44:29 +0000 (17:44 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev am:
6d0e0bdcd5 am:
9f05056ccd am:
c8dd22bcdf
am:
237bf1f923
Change-Id: I3e4a84599dc53f268f8241d225b073b3db8ccb22
smain@google.com [Tue, 27 Sep 2016 17:39:29 +0000 (17:39 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager am:
2f2365de4a am:
6ed77be41d am:
6b860feb42
am:
3eeee3691d
Change-Id: Ibed8e6cdd2f1cfca3b19e10e4663e7a051c5cd2b
Scott Main [Tue, 27 Sep 2016 17:39:25 +0000 (17:39 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev am:
6d0e0bdcd5 am:
9f05056ccd
am:
c8dd22bcdf
Change-Id: I656f2dc9fefbb85953dc8e325e8641b22a8fbfe6
smain@google.com [Tue, 27 Sep 2016 17:35:23 +0000 (17:35 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager am:
2f2365de4a am:
6ed77be41d
am:
6b860feb42
Change-Id: Ie557857bf37b9c79d827ac0521cc2fec08e9469f
Scott Main [Tue, 27 Sep 2016 17:32:20 +0000 (17:32 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev am:
6d0e0bdcd5
am:
9f05056ccd
Change-Id: I98b8f6eac44ae4c044a6493b9e2b85c822137f7b
Scott Main [Tue, 27 Sep 2016 17:29:49 +0000 (17:29 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev am:
6d0e0bdcd5
am:
c415e8c577
Change-Id: I1daeefb0e83b13e65d0ad71a6a87f03380736c3d
smain@google.com [Tue, 27 Sep 2016 17:28:54 +0000 (17:28 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager am:
2f2365de4a
am:
d32abed1af
Change-Id: I9d6f6f9ce302b3c87d7aac19e6e97cd8a0024f98
smain@google.com [Tue, 27 Sep 2016 17:28:53 +0000 (17:28 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager am:
2f2365de4a
am:
6ed77be41d
Change-Id: I24b8c286fa94c6c27eb9e9fe67b0d38cd17f5544
Scott Main [Tue, 27 Sep 2016 17:24:00 +0000 (17:24 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev
am:
6d0e0bdcd5
Change-Id: Iac2142420e6c7bd78acd91a61575daf7c5f0d339
Scott Main [Tue, 27 Sep 2016 17:23:56 +0000 (17:23 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev
am:
6d0e0bdcd5
Change-Id: Ibb16e34e6669f782864dd3fa35223b09da346253
smain@google.com [Tue, 27 Sep 2016 17:23:54 +0000 (17:23 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager
am:
2f2365de4a
Change-Id: I7a5261a043d803fdc0ac6b916708e0f743b31865
smain@google.com [Tue, 27 Sep 2016 17:23:54 +0000 (17:23 +0000)]
add source.properties file to the offline docs build which is required to get this in the SDK Manager
am:
2f2365de4a
Change-Id: I15b5ea8a37ec7c718d23db14baed6c8ffb0af13c
Scott Main [Tue, 27 Sep 2016 17:17:16 +0000 (17:17 +0000)]
Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev
Kevin Hufnagle [Tue, 27 Sep 2016 14:33:26 +0000 (14:33 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev am:
02828bd68d am:
7b6cebcaa2 am:
a6af4c9422
am:
cbf30735dc
Change-Id: I9c2d36a1f46927578f0cc3fd8941c1f4b0f3b549
Kevin Hufnagle [Tue, 27 Sep 2016 14:32:34 +0000 (14:32 +0000)]
docs: Removed obsolete links to Android N Preview Reference. am:
2dbf44ab76 am:
173b560545 am:
03a9e5908e
am:
d6783f04fa
Change-Id: If7e0225f5dce99a8417ad49e8cf28849b2792971
Eric Laurent [Tue, 27 Sep 2016 14:31:46 +0000 (14:31 +0000)]
Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am:
a15c471ee5 am:
1da31b6f8b am:
dbca980a9f
am:
7794789ef3
Change-Id: I4406dda8f7e8372cca8bb22e438315066b6f9bef
Kevin Hufnagle [Tue, 27 Sep 2016 14:27:54 +0000 (14:27 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev am:
02828bd68d am:
7b6cebcaa2
am:
a6af4c9422
Change-Id: Ib4bd998e6d902dbd10dc9be3020b78ee8db6257b
Kevin Hufnagle [Tue, 27 Sep 2016 14:27:06 +0000 (14:27 +0000)]
docs: Removed obsolete links to Android N Preview Reference. am:
2dbf44ab76 am:
173b560545
am:
03a9e5908e
Change-Id: I26a18f2ca0009cd78b548e24b8fb22b912a031eb
Eric Laurent [Tue, 27 Sep 2016 14:26:11 +0000 (14:26 +0000)]
Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am:
a15c471ee5 am:
1da31b6f8b
am:
dbca980a9f
Change-Id: I2dc3f0daa42e7db8a063240e9e8cba091fc86757
Android Build Merger (Role) [Tue, 27 Sep 2016 14:23:19 +0000 (14:23 +0000)]
Merge "Merge "API: Update ResourceBundle to OpenJDK8u60" am:
9d16a441a6 am:
29319829fb am:
49d903dac4" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 27 Sep 2016 14:22:53 +0000 (14:22 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev am:
02828bd68d
am:
7b6cebcaa2
Change-Id: I6e46cf49117a2492d9a02b3b78781367c4bc78f2
Eric Laurent [Tue, 27 Sep 2016 14:22:20 +0000 (14:22 +0000)]
DO NOT MERGE - fix truncated boot sound am:
75bf3fd73b -s ours am:
37777e05eb am:
d30707f77a
am:
b21257faed
Change-Id: I5d85055d6231bf235e7dbc1f4c731aeef8a8fce1
Tobias Thierer [Tue, 27 Sep 2016 14:22:08 +0000 (14:22 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60" am:
9d16a441a6 am:
29319829fb
am:
49d903dac4
Change-Id: Iaeab7c7c8d24b68d2be75ddd3f6055ba78be906d
Kevin Hufnagle [Tue, 27 Sep 2016 14:22:01 +0000 (14:22 +0000)]
docs: Removed obsolete links to Android N Preview Reference. am:
2dbf44ab76
am:
173b560545
Change-Id: I7947745fe7e6ea20637aa07c6352b67803e8a7c8
Eric Laurent [Tue, 27 Sep 2016 14:21:12 +0000 (14:21 +0000)]
Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am:
a15c471ee5
am:
1da31b6f8b
Change-Id: Id354e4a5ea5a78f971e46a981f0fc00c047d9011
Christopher Wiley [Tue, 27 Sep 2016 14:19:40 +0000 (14:19 +0000)]
Merge "Implement untetherAll as calls to stopTethering" am:
7fd48d54de am:
bce303a050
am:
9215efd10c
Change-Id: If33c9605aa0a1af08401ab9b6dd011decf1ec4ca
Christopher Wiley [Tue, 27 Sep 2016 14:18:46 +0000 (14:18 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes" am:
4062bec04e am:
8d7e3b0205
am:
bf596f7621
Change-Id: I4d1081c832c1d3bff9a0946c670929eca4f0f695
Eric Laurent [Tue, 27 Sep 2016 14:18:44 +0000 (14:18 +0000)]
DO NOT MERGE - fix truncated boot sound am:
75bf3fd73b -s ours am:
37777e05eb
am:
d30707f77a
Change-Id: I17dddf43347f90d3029c47cb54b5f2328892e8c7
Kevin Hufnagle [Tue, 27 Sep 2016 14:17:52 +0000 (14:17 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev am:
02828bd68d
am:
e589fd82d2
Change-Id: Ib35a6a53ce4cfb83f54a1adaa6bc57ed438bafef
Kevin Hufnagle [Tue, 27 Sep 2016 14:17:13 +0000 (14:17 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev
am:
02828bd68d
Change-Id: I4674d3f271d4dc1e3bf25b7ad56413cbecf98702
Kevin Hufnagle [Tue, 27 Sep 2016 14:17:10 +0000 (14:17 +0000)]
docs: Removed obsolete links to Android N Preview Reference.
am:
2dbf44ab76
Change-Id: Iff8f36ac1b8f8f6647caa6d5f3c5f3a1e7c8315a
Tobias Thierer [Tue, 27 Sep 2016 14:16:28 +0000 (14:16 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60" am:
9d16a441a6
am:
29319829fb
Change-Id: I02fba9b316fed6ee248c69f97570da8d1f1ac531
Eric Laurent [Tue, 27 Sep 2016 14:16:13 +0000 (14:16 +0000)]
Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev
am:
a15c471ee5
Change-Id: I6240d88651abbd2172f18479545809212897d50d
Eric Laurent [Tue, 27 Sep 2016 14:15:14 +0000 (14:15 +0000)]
DO NOT MERGE - fix truncated boot sound am:
75bf3fd73b -s ours
am:
37777e05eb
Change-Id: I508258ad8bbbfffc85dd0c60d5a9a909f26f224a
Kevin Hufnagle [Tue, 27 Sep 2016 14:14:43 +0000 (14:14 +0000)]
docs: Removed obsolete links to Android N Preview Reference. am:
2dbf44ab76
am:
ece9cb1631
Change-Id: Ie5a2c93873511b3420817637d44a45d7762ef71c
Eric Laurent [Tue, 27 Sep 2016 14:13:50 +0000 (14:13 +0000)]
Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev am:
a15c471ee5
am:
d05f826739
Change-Id: I3ef288e0770b0f2967c48e73aec2a08aa1fe0ccc
Tobias Thierer [Tue, 27 Sep 2016 14:11:45 +0000 (14:11 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
am:
9d16a441a6
Change-Id: I90e0bb992f002718c5f509c226fdc0d57e651aff
Eric Laurent [Tue, 27 Sep 2016 14:11:38 +0000 (14:11 +0000)]
DO NOT MERGE - fix truncated boot sound am:
75bf3fd73b
am:
322f13a8ff -s ours
Change-Id: I8041b3a904f71bf54c7b79d7072ac0a3798fa646
Eric Laurent [Tue, 27 Sep 2016 14:11:07 +0000 (14:11 +0000)]
DO NOT MERGE - fix truncated boot sound
am:
75bf3fd73b -s ours
Change-Id: Ic9e57280b75a8226f8c61f8b4cb937f74e105ec3
Tobias Thierer [Tue, 27 Sep 2016 14:03:44 +0000 (14:03 +0000)]
Merge "API: Update ResourceBundle to OpenJDK8u60"
Christopher Wiley [Tue, 27 Sep 2016 13:33:03 +0000 (13:33 +0000)]
Merge "Implement untetherAll as calls to stopTethering" am:
7fd48d54de
am:
bce303a050
Change-Id: I2ef23434efd5730b9d482423ad046fdb502a4fd6
Christopher Wiley [Tue, 27 Sep 2016 13:32:06 +0000 (13:32 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes" am:
4062bec04e
am:
8d7e3b0205
Change-Id: I9595856421a848a570f4894fa55523a72a7fec44
Christopher Wiley [Tue, 27 Sep 2016 13:27:57 +0000 (13:27 +0000)]
Merge "Implement untetherAll as calls to stopTethering"
am:
7fd48d54de
Change-Id: I35eda039f92836a9216bfed93b8fc2c39a434a3c
Christopher Wiley [Tue, 27 Sep 2016 13:27:05 +0000 (13:27 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
am:
4062bec04e
Change-Id: I0b0a15c94a4cb0475fc29ed3bcbf58ed2d6f00be
Treehugger Robot [Tue, 27 Sep 2016 13:18:53 +0000 (13:18 +0000)]
Merge "Implement untetherAll as calls to stopTethering"
Treehugger Robot [Tue, 27 Sep 2016 13:18:37 +0000 (13:18 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes"
Kevin Hufnagle [Tue, 27 Sep 2016 04:32:07 +0000 (04:32 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev
am:
02828bd68d
Change-Id: I43eeb40bcfd1cc194b2a078d594a47c539bafd34
Kevin Hufnagle [Tue, 27 Sep 2016 04:32:03 +0000 (04:32 +0000)]
docs: Removed obsolete links to Android N Preview Reference.
am:
2dbf44ab76
Change-Id: Ibe82d111e3566432ef0accfdb7c1947c5c323ab8
Kevin Hufnagle [Tue, 27 Sep 2016 04:26:35 +0000 (04:26 +0000)]
Merge "docs: Removed obsolete links to Android N Preview Reference." into nyc-dev
Bill Yi [Tue, 27 Sep 2016 03:46:21 +0000 (03:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
880e823e9e -s ours
am:
6d2c9c29dc -s ours
Change-Id: I86e6e8da3aeba36ad82666c08567932151afe62c
Bill Yi [Tue, 27 Sep 2016 03:45:30 +0000 (03:45 +0000)]
Import translations. DO NOT MERGE am:
45da426dd6 -s ours
am:
4b7d93c55d -s ours
Change-Id: I065f9e05c857a0602a36978b247385b1bed14183
Bill Yi [Tue, 27 Sep 2016 03:40:32 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
880e823e9e -s ours
Change-Id: I25f83a3ef505174745cd6196996de93ed6da9bd3
Bill Yi [Tue, 27 Sep 2016 03:40:30 +0000 (03:40 +0000)]
Import translations. DO NOT MERGE
am:
45da426dd6 -s ours
Change-Id: I80e946e5188c7d8669a283b1e374b8263b760876
TreeHugger Robot [Tue, 27 Sep 2016 03:36:46 +0000 (03:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 27 Sep 2016 03:17:26 +0000 (03:17 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
c3acddbb75 -s ours am:
f68f600ca8 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 27 Sep 2016 03:16:51 +0000 (03:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
c3acddbb75 -s ours
am:
f68f600ca8 -s ours
Change-Id: Ibf25f1055624c76de6dd921261418582d5cbda73
Android Build Merger (Role) [Tue, 27 Sep 2016 03:16:38 +0000 (03:16 +0000)]
Merge "Import translations. DO NOT MERGE am:
8f05e63417 -s ours am:
7a45aa2cff -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 27 Sep 2016 03:16:02 +0000 (03:16 +0000)]
Import translations. DO NOT MERGE am:
8f05e63417 -s ours
am:
7a45aa2cff -s ours
Change-Id: I95c036a3b6b7b80377a353e8a0cf4f6af438b87a
Android Build Merger (Role) [Tue, 27 Sep 2016 03:15:48 +0000 (03:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d48502972a -s ours am:
250e262f6e -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 27 Sep 2016 03:15:13 +0000 (03:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d48502972a -s ours
am:
250e262f6e -s ours
Change-Id: I509d6e3ec4b4b2edd5b9e340241f8babd247c5f7
Android Build Merger (Role) [Tue, 27 Sep 2016 03:14:55 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE am:
1ca93650e9 -s ours am:
b6227f2153 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 27 Sep 2016 03:14:20 +0000 (03:14 +0000)]
Import translations. DO NOT MERGE am:
1ca93650e9 -s ours
am:
b6227f2153 -s ours
Change-Id: I38849a635cc3e7f6ca055aae1550be55114665b5
Android Build Merger (Role) [Tue, 27 Sep 2016 03:13:59 +0000 (03:13 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a445650c90 -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Tue, 27 Sep 2016 03:13:22 +0000 (03:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
a445650c90 -s ours
Change-Id: I23edb718f428d1fa25e28190ba131d7094f19bf0
Bill Yi [Tue, 27 Sep 2016 03:10:00 +0000 (03:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
c3acddbb75 -s ours
Change-Id: Id6245186681dacd5ac55d9be719080d22d32bbd1
Bill Yi [Tue, 27 Sep 2016 03:09:59 +0000 (03:09 +0000)]
Import translations. DO NOT MERGE
am:
8f05e63417 -s ours
Change-Id: Iabbdb8518c22adffeb06bdd12a270b9ed67ea8f7
Bill Yi [Tue, 27 Sep 2016 03:09:25 +0000 (03:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
a445650c90 -s ours
Change-Id: I786833b8c5ee7b27a942209bc15cdca70b9b8335
Bill Yi [Tue, 27 Sep 2016 03:09:21 +0000 (03:09 +0000)]
Import translations. DO NOT MERGE
am:
8385775f42 -s ours
Change-Id: Ida8188c5ca68f7bc57f4560950bd08a33608b52e
Bill Yi [Tue, 27 Sep 2016 03:08:13 +0000 (03:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d0fb83f3ce -s ours
Change-Id: I2047f6596a7b8d9e1707b8855015e3cbe4cf38d6
Bill Yi [Tue, 27 Sep 2016 03:08:07 +0000 (03:08 +0000)]
Import translations. DO NOT MERGE
am:
062640e874 -s ours
Change-Id: I2205072026c9923675cc9820b514c5b83e3f6181
OSDN Git Service
