OSDN Git Service
Beverly Tai [Thu, 14 Sep 2017 17:40:12 +0000 (17:40 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b
am:
ba55b3bea6 -s ours
Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9
Beverly Tai [Thu, 14 Sep 2017 17:29:37 +0000 (17:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2
am:
8462da779b
Change-Id: Ibbfa865f666f174b307fbe7a50ac73030d4a5c01
Beverly Tai [Thu, 14 Sep 2017 17:21:42 +0000 (17:21 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours
am:
0a93f42be2
Change-Id: I2da7592547bbd1c3c028eb06360c15baf9a8c13c
Beverly Tai [Thu, 14 Sep 2017 17:14:13 +0000 (17:14 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8
am:
3be1269c0a -s ours
Change-Id: I194e18d7ac9ac98010e00db548e8f39bec220fc0
Beverly Tai [Thu, 14 Sep 2017 16:46:42 +0000 (16:46 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
am:
0bdb7902d8
Change-Id: I67c6ceac68b57b9d2e619a25b5e08721b0385db8
Beverly Tai [Thu, 14 Sep 2017 16:40:01 +0000 (16:40 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
Beverly Tai [Thu, 14 Sep 2017 15:10:05 +0000 (15:10 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2 am:
0bf81b63f9 am:
e148e39d61
am:
a126d94892 -s ours
Change-Id: Iafccd7ef757e1b858a58ce31df55f0f0b545903f
Beverly Tai [Thu, 14 Sep 2017 15:03:04 +0000 (15:03 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2 am:
0bf81b63f9
am:
e148e39d61
Change-Id: Ia19f7708f64129c5ab3fb37c516e00a81b3cfc1b
Beverly Tai [Thu, 14 Sep 2017 14:55:33 +0000 (14:55 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2
am:
0bf81b63f9
Change-Id: Id2d47d51581669ee4eb8354e3881f9cbeb57e24f
Beverly Tai [Thu, 14 Sep 2017 14:50:33 +0000 (14:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92
am:
9a74d618c2
Change-Id: If044222a2428095f3faa492f72d39acbb0db5bd3
Beverly Tai [Thu, 14 Sep 2017 14:43:40 +0000 (14:43 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours
am:
b004901c92
Change-Id: I528ac97ec904ce789b50bde5e8174d81c85d5e1b
Beverly Tai [Thu, 14 Sep 2017 14:35:34 +0000 (14:35 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c
am:
d54bc6a908 -s ours
Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2
Beverly Tai [Thu, 14 Sep 2017 14:29:56 +0000 (14:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee
am:
97b98a3b1c
Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2
Beverly Tai [Thu, 14 Sep 2017 14:25:02 +0000 (14:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am:
8150eb82ee
Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
Beverly Tai [Thu, 14 Sep 2017 14:18:07 +0000 (14:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
Bill Yi [Wed, 13 Sep 2017 23:50:04 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours
am:
98313f5996 -s ours
Change-Id: If26ea10608d586d3014bd99d2c27720d2316e37a
Bill Yi [Wed, 13 Sep 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours
am:
8eb6ff0212 -s ours
Change-Id: I6bf75581266953ee24347d9248a6f672a0db7651
Bill Yi [Wed, 13 Sep 2017 23:37:36 +0000 (23:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours
am:
2b492b6502 -s ours
Change-Id: I1968606706a2c4a0041b4e26f08d3de5aa6e4046
Bill Yi [Wed, 13 Sep 2017 23:31:03 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours
am:
fc0a43743e -s ours
Change-Id: Idd71b32264c2fe1dc2b2cc572778882650170f81
Bill Yi [Wed, 13 Sep 2017 23:26:19 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours
am:
b7c6238556 -s ours
Change-Id: Id8c25356f63b7755f305b6f88eaa49ebdb3903df
Bill Yi [Wed, 13 Sep 2017 23:18:12 +0000 (23:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5b812c8df6 -s ours
Change-Id: Ie715aed27dae619de572006fe4a37210ac4cf21a
Bill Yi [Wed, 13 Sep 2017 23:14:37 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b69531f99e -s ours
am:
16bc5f15b7 -s ours
Change-Id: I09bbb5157c9e43f348cba855db6430245c525c54
Bill Yi [Wed, 13 Sep 2017 23:12:27 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b53e9cf4a2 -s ours
Change-Id: Ibe71d1a15eba70b96675afcb711eaa46597ab82d
Bill Yi [Wed, 13 Sep 2017 23:11:18 +0000 (23:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours
am:
4f8b486f69 -s ours
Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17
Bill Yi [Wed, 13 Sep 2017 23:08:34 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c00cf0a49d -s ours
Change-Id: Icaaa9992ba23d840e46ab7ab774dadb7c279ba7b
Bill Yi [Wed, 13 Sep 2017 23:05:48 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours
am:
c0ccea9bf5 -s ours
Change-Id: Ie82ec238bedf1d6b36fa027b466f1682c368f8c4
Bill Yi [Wed, 13 Sep 2017 23:05:08 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7cc053233b -s ours
Change-Id: I728dcfc27c89c3f9d494b06d1a09625e6b33b085
Bill Yi [Wed, 13 Sep 2017 23:00:53 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7804b17f0e -s ours
Change-Id: I828e11d0d99cf7f5081ab3e4ea67d86dc6d44e9f
Bill Yi [Wed, 13 Sep 2017 23:00:37 +0000 (23:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours
am:
318728fd6b -s ours
Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96
Bill Yi [Wed, 13 Sep 2017 22:54:23 +0000 (22:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b69531f99e -s ours
Change-Id: I27d6736b64df7e2887de545008d99b1bb5418049
Bill Yi [Wed, 13 Sep 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours
am:
697f149acf -s ours
Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec
Bill Yi [Wed, 13 Sep 2017 22:48:33 +0000 (22:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours
am:
1db479ee26 -s ours
Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da
Bill Yi [Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
37f29b0359 -s ours
Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813
Bill Yi [Wed, 13 Sep 2017 22:44:20 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours
am:
9abe093864 -s ours
Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b
Bill Yi [Wed, 13 Sep 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
f9075cb448 -s ours
Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b
Bill Yi [Wed, 13 Sep 2017 22:40:02 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
222cc10fee -s ours
am:
289d6b71a9 -s ours
Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc
Bill Yi [Wed, 13 Sep 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c016ef25c8 -s ours
Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d
Bill Yi [Wed, 13 Sep 2017 22:35:01 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
9f5e95f64e -s ours
Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae
Bill Yi [Wed, 13 Sep 2017 22:30:34 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
79bfe12e6b -s ours
Change-Id: I5c0b3e5592d6e3912bdfbb264961fcc37b43a941
Bill Yi [Wed, 13 Sep 2017 21:31:42 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b484143b40 -s ours
am:
307f6a4d92 -s ours
Change-Id: Ibfc25bcb992c45a43c799412a7f47f6a12a77234
Bill Yi [Wed, 13 Sep 2017 21:17:16 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e5fe30c1b0 -s ours
Change-Id: Ib28bd3a43d5fc857143345f25d63219f86149af5
Bill Yi [Wed, 13 Sep 2017 20:49:32 +0000 (20:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
222cc10fee -s ours
Change-Id: I711cdf888e217534fc50d3beae235cc516a28434
Bill Yi [Wed, 13 Sep 2017 20:07:25 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
b484143b40 -s ours
Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb
Dave Friedman [Thu, 15 Jun 2017 01:45:58 +0000 (18:45 -0700)]
Docs: Updating ANDROID_ID information to reflect Android O changes.
Bug:
38270718
Test: Verified on local build.
Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
TreeHugger Robot [Wed, 13 Sep 2017 04:54:24 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:40:30 +0000 (04:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:39:44 +0000 (04:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:38:39 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:38:04 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:37:22 +0000 (04:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:36:45 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:36:15 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:35:32 +0000 (04:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:34:48 +0000 (04:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:33:56 +0000 (04:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:32:49 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:32:15 +0000 (04:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 13 Sep 2017 04:31:10 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Beverly Tai [Tue, 12 Sep 2017 16:57:46 +0000 (16:57 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360 am:
4bdddadcc5
am:
be95e1d91e -s ours
Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570
Beverly Tai [Tue, 12 Sep 2017 16:49:49 +0000 (16:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093 am:
6cd1142360
am:
4bdddadcc5
Change-Id: I0530a9ca24c432ee0a4af4861bad7976ca355070
Beverly Tai [Tue, 12 Sep 2017 16:41:18 +0000 (16:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0 am:
b4913b7093
am:
6cd1142360
Change-Id: I1f5c3e90eb7cc9679d54699d2ead567e4db6c789
Beverly Tai [Tue, 12 Sep 2017 16:32:29 +0000 (16:32 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours am:
5252746fe0
am:
b4913b7093
Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
Beverly Tai [Tue, 12 Sep 2017 16:23:44 +0000 (16:23 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec am:
c64209fb6a -s ours
am:
5252746fe0
Change-Id: I9e4cc6677d3ea0c31584efb0416e1d8716285f68
Beverly Tai [Tue, 12 Sep 2017 16:15:49 +0000 (16:15 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6 am:
ff058a78ec
am:
c64209fb6a -s ours
Change-Id: I8fdcba43f18249ca30843ab780f1cb945c068e37
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6
am:
ff058a78ec
Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours
am:
d0d0fea3d6
Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am:
89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly [Thu, 7 Sep 2017 18:25:02 +0000 (14:25 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
Beverly [Fri, 1 Sep 2017 15:14:57 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: I02f615624b33c3fb6e2fbb15ce44a0032b6f4387
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
Bill Yi [Tue, 12 Sep 2017 05:44:16 +0000 (22:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife1dd85496a4f99c95e6620970fcda9364f100d3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 05:36:07 +0000 (22:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebafa9958d7c5dbb9600897fb4a2cd284b901958
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:36:21 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5eb5b3248f31366dac48ac077820b742233685e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:28:34 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie79ea5d4e49249e328c98088af5a62959fc4d6cf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:20:45 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib60541d67a15603af67a8c0246df26901d70d30d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 04:12:48 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5acf10cd74c7c7ced9b3d6a6975e7d116b2033c7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:54:50 +0000 (20:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic40e264d75737f574cd2f5b66045d88a13abf67b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:46:35 +0000 (20:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8bc67ec371eee9c6ac521fa1137e6cc48206d2e3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:39:03 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9970feb36534a07156682d039527d889a074f481
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:31:22 +0000 (20:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77229f75dd516309bfb61a794d5f3225c3573baf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:16:43 +0000 (20:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I582cdd23abc2024c369353d2ce9ef5ab0e093a35
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:08:41 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I73f2bcb2ea1ba973425305c7d0e38f4ba5ec0b60
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 03:00:26 +0000 (20:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0c3392b8cb18eb68e3f7915b3a4bc86c681e3ae7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Tue, 12 Sep 2017 02:52:14 +0000 (19:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7525340cf04332581060c36ca1454b9fd628b65
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Siyamed Sinir [Tue, 12 Sep 2017 00:45:19 +0000 (00:45 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82
am:
7359d93942 -s ours
Change-Id: I87dd0675b05119a349887e534ec639fc798709e3
Siyamed Sinir [Tue, 12 Sep 2017 00:38:21 +0000 (00:38 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242
am:
4d91e69c82
Change-Id: Ie45e4da6e29b61481d6d43cc24530e5e0db7fa15
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74
am:
5288fcc242
Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e
am:
954b6e9b74
Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be
am:
8393b54d3e
Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635
am:
064bfd22be
Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
Tony Mak [Mon, 11 Sep 2017 14:43:33 +0000 (14:43 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3 am:
4453c3cda2
am:
79a32d0a8a -s ours
Change-Id: I4b97babe4f5259c71bb301d08318e09eb4560e37
Tony Mak [Mon, 11 Sep 2017 14:36:08 +0000 (14:36 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357 am:
68cce397b3
am:
4453c3cda2
Change-Id: Ic48643564a3685bc602c66901c9761b741b148a5
Tony Mak [Mon, 11 Sep 2017 14:28:44 +0000 (14:28 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227 am:
34377e0357
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
Tony Mak [Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)]
resolve merge conflicts of
56a2b529373b to nyc-dev am:
d7dcc3e227
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6