git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21 -s ours
am: cd4371f3cc -s ours

Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
am: 0a09cd4b21 -s ours

Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev am: 41ae4b7eae
am: 6c1ecb973c

Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:21:27 +0000 (19:21 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0 am: 77243e2d28 -s ours
am: 114cd10ac9 -s ours

Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:57 +0000 (19:14 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 am: 19f08130b1 -s ours
am: fa70de88c5 -s ours

Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
am: 41ae4b7eae

Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
am: 77243e2d28 -s ours

Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93
am: 19f08130b1 -s ours

Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:13 +0000 (14:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0

Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:07 +0000 (14:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb

Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie4fc80ab24fb6a8f3272a6540e6d93d26b7d5496
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:09 +0000 (13:13 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb

Change-Id: Id7171c69c55a042c6ac6cad743a23960591b9e86

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:01 +0000 (13:13 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01

Change-Id: I697689c9d02095934f558b3b2ce3786170b25305

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:12:24 +0000 (05:12 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ibd7d5723c9c4cdc09efcb30f604ff43a096c5da1
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:17:01 +0000 (12:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93

Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:16:54 +0000 (12:16 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486

Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:16:22 +0000 (04:16 -0800)]

Import translations. DO NOT MERGE

Change-Id: I3040ff1778e9dc85cc004396ec70bf272d73c0f5
Auto-generated-cl: translation import

commit | commitdiff | tree

Pankaj Kanwar [Wed, 24 Jan 2018 23:02:22 +0000 (23:02 +0000)]

Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 24 Jan 2018 18:13:25 +0000 (18:13 +0000)]

Merge "Fixed AUTOFILL_UI_LATENCY metric." into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 23 Jan 2018 21:39:09 +0000 (21:39 +0000)]

Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev

commit | commitdiff | tree

Felipe Leme [Mon, 22 Jan 2018 23:33:40 +0000 (15:33 -0800)]

DO NOT MERGE - fix AFM.getComponentNameFromContext()

This method broke on O-MR1 when I3abf999eb6056c1df7982780bae43b58337c0668
was chery-picked from master.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.AttachedContextActivityTest#testAutofill
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Also individually ran tests that failed (due to flakiness) when ran in a suite:

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.OptionalSaveActivityTest#testDontShowSaveUiWhenUserManuallyFilled_oneDatasetAllRequiredFields

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest #testTapLink_tapBack_thenStartOverBySayingYesAndManualRequest

Fixes: 71960322

Change-Id: Ia093dcefe6699dc9493c46d671e48c2000214b31
Merged-In: I3abf999eb6056c1df7982780bae43b58337c0668

commit | commitdiff | tree

Michael Plass [Fri, 6 Oct 2017 17:29:51 +0000 (10:29 -0700)]

Metrics wifi.proto for connected wifi score

(cherry picked from commit bb367b689605d0ca3641984b4d59bbe13e6861df)

Bug: 67429363
Bug: 71708302
Test: Wifi unit tests

Change-Id: I2993a02e7b3199c2b50dc2ddb7704fc5b6364025
Merged-In: I315613b8ea3aa1d02810ae376c76083d80865d31

commit | commitdiff | tree

Felipe Leme [Thu, 18 Jan 2018 23:21:36 +0000 (15:21 -0800)]

Fixed AUTOFILL_UI_LATENCY metric.

This metric was using the RESERVED_FOR_LOGBUILDER_COUNTER and hence was not
being picked up.

Bug: 71863561
Fixes: 72175011

Test: adb shell logcat -b events | grep sysui | grep 1136
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: I34f701ff5336a413477fd14172d16d8d1e5403ad

commit | commitdiff | tree

TreeHugger Robot [Wed, 17 Jan 2018 20:36:06 +0000 (20:36 +0000)]

Merge "Add metric for anomaly detection" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:30 +0000 (23:42 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a am: 9b90490d1d

Change-Id: If121edaf0d2edac5688ff2aa4ed48da1d5e1c1c7

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:24 +0000 (23:42 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a

Change-Id: Ie180da5d659b106e1c5299b0a46b6cbf24548ae0

commit | commitdiff | tree

Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]

RESTRICT AUTOMERGE Preventing recursive referrence in drawables

Bug: 68706673
Bug: 66498711
Test: Added CTS tests

Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0

commit | commitdiff | tree

Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am: 48df033607
am: 69d240d584

Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f

commit | commitdiff | tree

Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am: 48df033607

Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465

commit | commitdiff | tree

TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]

commit | commitdiff | tree

TreeHugger Robot [Thu, 11 Jan 2018 20:50:20 +0000 (20:50 +0000)]

Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev

commit | commitdiff | tree

Tyler Gunn [Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)]

Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev

commit | commitdiff | tree

jackqdyulei [Tue, 24 Oct 2017 23:32:58 +0000 (16:32 -0700)]

Add metric for anomaly detection

ACTION_APP_STOP_AND_BACKGROUND_CHECK
FIELD_ANOMALY_ACTION_TYPE
ANOMALY_TYPE_WAKELOCK
ANOMALY_TYPE_WAKEUP_ALARM
ANOMALY_TYPE_UNOPTIMIZED_BT

Bug: 68215016
Test: Build
Merged-In: I66f0465a3b89713060948af31c370e9ac894e0ff
Change-Id: I66f0465a3b89713060948af31c370e9ac894e0ff

commit | commitdiff | tree

Kevin Hufnagle [Tue, 9 Jan 2018 23:51:10 +0000 (23:51 +0000)]

Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b
am: 800e061359

Change-Id: I3854641ab4f80f4bbeae9acd67522fcd8b8484c0

commit | commitdiff | tree

Kevin Hufnagle [Tue, 9 Jan 2018 23:44:04 +0000 (23:44 +0000)]

Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
am: d195a9972b

Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae

commit | commitdiff | tree

Kevin Hufnagle [Thu, 29 Jun 2017 22:58:48 +0000 (15:58 -0700)]

Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
docs: Revised descriptions of binding and connecting to services.

Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.

Test: make ds-docs

Bug: 63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e

commit | commitdiff | tree

Andrew Solovay [Mon, 8 Jan 2018 23:57:29 +0000 (15:57 -0800)]

docs: Adding file to support staging reference docs

We use the devsite tool to stage reference docs for review (to
go/dac-stage). That tool is currently broken, because it's expecting
to find a _reference-head-tags.html file which currently exists in
Piper but not in Gerrit. Copying that file into Gerrit lets us
build the Javadocs and stage them. (Files in p/f/b/docs don't
generally affect anything outside of the doc builds.)

Tested by building docs and staging Adapter.html to:
go/dac-stage/reference/android/widget/Adapter.html

Test: make ds-docs
Bug: 71717397
Change-Id: I05430f2d9f23e62b4423b2d6f304c4be1c43b880

commit | commitdiff | tree

Lucas Dupin [Mon, 30 Oct 2017 18:09:25 +0000 (11:09 -0700)]

Turn default gradient into solid black

Test: visual
Bug: 66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit e7476addecb4fec6abd08cfb7aa27c473ce5c1f0)

commit | commitdiff | tree

Pankaj Kanwar [Thu, 4 Jan 2018 01:03:27 +0000 (01:03 +0000)]

Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Fri, 22 Dec 2017 18:02:46 +0000 (18:02 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a8be1ae39 -s ours

Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95

commit | commitdiff | tree

TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]

Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:28:46 +0000 (19:28 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours am: 7cb6513f6d -s ours
am: f0687d1201 -s ours

Change-Id: Ia6678879fac5025f54f6d40b8dbc8ef7a1b9832d

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:26:54 +0000 (19:26 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am: ea2e302eff -s ours am: b6dab6b3ee -s ours
am: 1f9ae3b912 -s ours

Change-Id: I74c034b1c5247fb0ce7ace539014f9052092413e

commit | commitdiff | tree

Andrew Solovay [Thu, 21 Dec 2017 01:22:54 +0000 (17:22 -0800)]

DO NOT MERGE docs: Removing spurious end </pre> tag

Owing to a merge mixup, ended up adding a spurious </pre> where it
had no effect. Removing it just for hygiene's sake.

This doc error is only in oc-mr1-dev, not in master, so the fix
doesn't need to be merged.

Test: make ds-docs
Bug: 70812346
Change-Id: I5b54ed8fb1f068698d4dd4536383b52165b4d81f

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am: d21211470c -s ours am: f1c75d66ec -s ours
am: b7a560fb10 -s ours

Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am: d5a7faea83 -s ours am: bd14c44fd8 -s ours
am: f6c335b353 -s ours

Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am: 51fc07ad61 -s ours am: c344f9b1c7 -s ours
am: 39d480e67c -s ours

Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am: 5943ef281a -s ours am: 2c97ca3b62 -s ours
am: 934729c535 -s ours

Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours am: 0bfcd7eef7 -s ours
am: f123f221db -s ours

Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am: 7244723549 -s ours am: 05e41d0531 -s ours
am: 7baaa51e62 -s ours

Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am: 2d00ab621a -s ours am: e135a35edf -s ours
am: 301dfae698 -s ours

Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am: c81e5ae281 -s ours am: 13062c93e5 -s ours
am: 25d7b576ec -s ours

Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 18:18:04 +0000 (18:18 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am: 0a1948e515 -s ours
am: 7cb6513f6d -s ours

Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours
am: 0a1948e515 -s ours

Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 45d962274f -s ours

Change-Id: I43d3d8e14417f7aed30a470191386753c9957701

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 18:01:15 +0000 (18:01 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am: ea2e302eff -s ours
am: b6dab6b3ee -s ours

Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours
am: ea2e302eff -s ours

Change-Id: I9d23c6267a38545927029782293ef8a15961cca7

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am: d21211470c -s ours
am: f1c75d66ec -s ours

Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am: d5a7faea83 -s ours
am: bd14c44fd8 -s ours

Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am: 51fc07ad61 -s ours
am: c344f9b1c7 -s ours

Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours
am: d21211470c -s ours

Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am: 5943ef281a -s ours
am: 2c97ca3b62 -s ours

Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours
am: d5a7faea83 -s ours

Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours
am: 51fc07ad61 -s ours

Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 81b98ffb09 -s ours

Change-Id: I6369ce728c37d066932736566e465f73e7843eb5

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 599fb37c01 -s ours

Change-Id: Icc605bca96905c647601df651186850c874b5442

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours
am: 0bfcd7eef7 -s ours

Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: e1ca34b5c7 -s ours

Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours
am: 5943ef281a -s ours

Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am: 7244723549 -s ours
am: 05e41d0531 -s ours

Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 7ce772e941 -s ours

Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours
am: a683975c54 -s ours

Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am: 2d00ab621a -s ours
am: e135a35edf -s ours

Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 09:42:20 +0000 (01:42 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib6ac723de671ad98410e531aeeceb643f8eb0209

commit | commitdiff | tree

Bill Yi [Thu, 21 Dec 2017 01:23:17 +0000 (17:23 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38c81359b80048ce33a01f85d18de21e51c623fe

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Andrew Solovay [Wed, 20 Dec 2017 21:34:26 +0000 (21:34 +0000)]

Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 1f204cd1ea -s ours

Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours
am: 7244723549 -s ours

Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:25:28 +0000 (19:25 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am: c81e5ae281 -s ours
am: 13062c93e5 -s ours

Change-Id: I524e2276bb358a4373036c7943b1b00f53ebaa17

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 970261b46c -s ours

Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours
am: 2d00ab621a -s ours

Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]

Import translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours am: daa1d87e50 -s ours
am: 0e62ea2f4c -s ours

Change-Id: Ia89c48363a381a246f132a2d8619d7b650ed19ab

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 9593ca1955 -s ours

Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:16:46 +0000 (19:16 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours
am: c81e5ae281 -s ours

Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:12:46 +0000 (19:12 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0c1f4c2931 -s ours

Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]

Import translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours
am: daa1d87e50 -s ours

Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:10:42 +0000 (19:10 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 496af8623f -s ours

Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185

commit | commitdiff | tree

Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]

Import translations. DO NOT MERGE am: 406659b709 -s ours
am: 1fccf167ff -s ours

Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev