OSDN Git Service
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
Fix a no-op uninstall being treated as a failure
Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit
8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
Neil Fuller [Fri, 15 Sep 2017 09:40:05 +0000 (09:40 +0000)]
Merge "Finalize package intents used to trigger tz update" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 03:39:41 +0000 (03:39 +0000)]
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
Jiyong Park [Fri, 15 Sep 2017 02:19:19 +0000 (02:19 +0000)]
Merge "Fix missing null checking" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 02:15:23 +0000 (02:15 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 02:11:12 +0000 (02:11 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
Jean-Michel Trivi [Fri, 15 Sep 2017 01:37:55 +0000 (01:37 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 01:01:15 +0000 (01:01 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
TreeHugger Robot [Fri, 15 Sep 2017 00:56:22 +0000 (00:56 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Yohei Yukawa [Thu, 14 Sep 2017 23:35:06 +0000 (16:35 -0700)]
Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS
TYPE_TEXT_FLAG_NO_SUGGESTIONS is just a hint and does not mean
IME should never show a UI to display suggestions.
This CL makes that point clear in JavaDoc.
Test: checkbuild
Bug:
35875399
Bug:
38139781
Bug:
38184682
Fixes:
65693181
Change-Id: Id0c3b6bc05689a5f1c8b52637664f59d45850a60
TreeHugger Robot [Thu, 14 Sep 2017 23:28:24 +0000 (23:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 23:27:04 +0000 (23:27 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
Jiyong Park [Thu, 14 Sep 2017 22:48:06 +0000 (07:48 +0900)]
Fix missing null checking
Bug:
65666724
Test: build
Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480
TreeHugger Robot [Thu, 14 Sep 2017 22:26:55 +0000 (22:26 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 21:49:43 +0000 (21:49 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:31:11 +0000 (21:31 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
Andreas Gampe [Thu, 14 Sep 2017 21:02:09 +0000 (14:02 -0700)]
Frameworks: Fix NPE for agent attach
Fix missing null check.
Bug:
62445317
Test: m
Test: adb shell am start --attach-agent dummy.so
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsJvmtiAttachingHostTestCases
Change-Id: Ia16c2973b24f81839d20502339978e75a23a93bc
sergeyv [Thu, 14 Sep 2017 18:41:54 +0000 (11:41 -0700)]
Throw if BitmapFactory.Options.inBitmap is HARDWARE
Test: BitmapRegionDecoderTest#testHardwareBitmapIn
bug:
34415265
Change-Id: I58061504dd42ba918f89e1e5daf668f7601ca8d3
Chris Wren [Thu, 14 Sep 2017 19:55:32 +0000 (19:55 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
Philip P. Moltmann [Thu, 14 Sep 2017 19:52:31 +0000 (19:52 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:26:25 +0000 (19:26 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:19:56 +0000 (19:19 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
Beverly [Thu, 24 Aug 2017 13:33:57 +0000 (09:33 -0400)]
Added SafetyNet logging for UsbDebugging security bug.
Bug:
62187985
Test: n/a
Change-Id: I69244381b2172357c5adc8785fc73d1cfd3cc17d
Beverly Tai [Thu, 14 Sep 2017 19:09:35 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f -s ours
Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd
Beverly Tai [Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am:
d740b2d09a -s ours
Change-Id: I952391f1801cd678240b145971a733c755f62078
Beverly Tai [Thu, 14 Sep 2017 18:49:00 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
Hall Liu [Thu, 14 Sep 2017 18:39:46 +0000 (18:39 +0000)]
Merge "Unhide EMBMS download API" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 18:34:55 +0000 (18:34 +0000)]
Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 18:26:13 +0000 (18:26 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 18:24:15 +0000 (18:24 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d
am:
b237ea7cc8
Change-Id: Id56d8fb2630c03f7588ba475dafa48f5f7bab011
Adam Bookatz [Thu, 14 Sep 2017 18:23:36 +0000 (18:23 +0000)]
Merge "Throttle fetching RPM stats" into oc-mr1-dev
Adam Bookatz [Thu, 14 Sep 2017 18:22:34 +0000 (18:22 +0000)]
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
* changes:
Disable screen-off RPM timing in BatteryStats
Added resource power manager stats to batterystats
Beverly Tai [Thu, 14 Sep 2017 18:17:48 +0000 (18:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e
am:
c3e2d40309
Change-Id: I2376a371a5b4e5e29155dff85054b5620dfd2fa6
Beverly Tai [Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours
am:
9bc160cc3d
Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5
Lucas Dupin [Thu, 14 Sep 2017 00:24:09 +0000 (17:24 -0700)]
Do not animate icons when leaving AoD
Change-Id: I10ff1f06f6f699c0b0ceedffa54b463fdf25593f
Fixes:
37433524
Test: screenrecord # look at video frame by frame
Beverly Tai [Thu, 14 Sep 2017 18:02:07 +0000 (18:02 +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 am:
ef696aa47b
am:
a35989b007
Change-Id: Iac8295f193dca56ed6a1817e729c024921abe593
Beverly Tai [Thu, 14 Sep 2017 18:00:56 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours
am:
95e10b296e
Change-Id: I4cc393a504461b206355dd269c59cd5b38c80f09
Beverly Tai [Thu, 14 Sep 2017 18:00:15 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours
am:
26e84466d3 -s ours
Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0
Beverly Tai [Thu, 14 Sep 2017 17:51:28 +0000 (17:51 +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
am:
ef696aa47b
Change-Id: I977532e25b0bbfb05c1687d9cca7311d46d5eb8c
Beverly Tai [Thu, 14 Sep 2017 17:50:15 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
am:
121d3b89f7 -s ours
Change-Id: I91cb627a007c03660d41b0a01d3de71165373ff1
Beverly Tai [Thu, 14 Sep 2017 17:44:23 +0000 (17:44 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b
am:
68f91528c3 -s ours
Change-Id: Ib051065fc2e83bc001d82f18c9150339842f5e21
Philip P. Moltmann [Wed, 13 Sep 2017 21:17:21 +0000 (14:17 -0700)]
Do not fail session.commit on current thread
The adb install command calls session.commit() requires the failure to
be delivered on a different thread than the one that calls
session.commit().
Test: Tried to install invalid package via adb install
Change-Id: I8b616c750afa81f126fa3d3576d21df8274b1432
Fixes:
65555295
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:34:14 +0000 (17:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
Siyamed Sinir [Thu, 14 Sep 2017 17:34:02 +0000 (17:34 +0000)]
Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
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:25:25 +0000 (17:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
am:
61bc3f3c9b
Change-Id: Iba63e8e9b1c543478c16e49c2f81a8cb32567529
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
Hall Liu [Thu, 14 Sep 2017 17:20:12 +0000 (17:20 +0000)]
Merge changes from topic "embms-cherry-pick" into oc-mr1-dev
* changes:
Make EMBMS adjustments for 08/04
Prepare EMBMS apis for un-hiding
Beverly Tai [Thu, 14 Sep 2017 17:16:48 +0000 (17:16 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
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
Lucas Dupin [Wed, 13 Sep 2017 23:34:58 +0000 (16:34 -0700)]
Show big text on AoD
Test: Receive notification, look at AoD
Change-Id: I4ccb33895b5acf12a6341c22c853b0cf75036497
Fixes:
64128466
TreeHugger Robot [Thu, 14 Sep 2017 17:07:16 +0000 (17:07 +0000)]
Merge "Show Autofill Service icon on Save UI." into oc-mr1-dev
Jean-Michel Trivi [Tue, 12 Sep 2017 23:45:34 +0000 (16:45 -0700)]
AudioPlaybackConfiguration: prevent race condition on mIPlayerShell
Synchronize changes to mIPlayerShell after release of corresponding
player.
Flush binder commands when a player is released, in AudioService
and in the clients that have an AudioPlaybackCallback implementation.
Do the same in MediaSessionService, which directly implements
the IPlaybackConfigDispatcher interface, without going through
the AudioPlaybackCallback registration and notification
mechanisms.
Test: adb shell /system/bin/write_sine_callback -m2 -pl
Bug:
65450109
Change-Id: I2f0697e0e164283284ce30d2cc736c4f8df270c4
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
Jeff Sharkey [Thu, 14 Sep 2017 16:29:56 +0000 (16:29 +0000)]
Merge "Update network rules on meteredness changes." into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 15:26:41 +0000 (15:26 +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 am:
2435c816d8
am:
a62951f28f
Change-Id: I98176e73e4fc9e1627c638ff7510fdc35b3b874f
Beverly Tai [Thu, 14 Sep 2017 15:19:03 +0000 (15:19 +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
am:
2435c816d8
Change-Id: Idba71a4e659947f4ebf0dd76c3d305bc3a9132e6
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
Chris Wren [Thu, 14 Sep 2017 14:55:55 +0000 (10:55 -0400)]
also log user-initiated notification collapse events
Bug:
62787514
Test: runtest systemui-notification
Change-Id: I8e7e3bad5d2d5bbd0cebe2c5927e83b4ead4db1c
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
TreeHugger Robot [Thu, 14 Sep 2017 13:53:49 +0000 (13:53 +0000)]
Merge "Add logs to IOExceptions during adb backup" into oc-mr1-dev
Neil Fuller [Wed, 13 Sep 2017 15:01:58 +0000 (16:01 +0100)]
Finalize package intents used to trigger tz update
Finalize the package intents used to trigger tz update and
improve the documentation.
Bug:
64018084
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
Merged-In: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
(cherry picked from commit
228dc6cfefd06936657fa39848f7ee73162def8f)
Chris Wren [Thu, 14 Sep 2017 12:05:12 +0000 (12:05 +0000)]
Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Fix typo in LockSettingsService.getDecryptedPasswordsForAllTiedProfiles" into oc-mr1-dev
Jan Althaus [Wed, 13 Sep 2017 11:55:29 +0000 (13:55 +0200)]
Change default smart select range for logging to [0,0]
Bug:
64914512
Test: Manually tested that logs are correct. Will follow up with automated tests.
Change-Id: I5eb151f49f9dd665c6c76625ebb2b9c0be96a11d
Jakub Pawlowski [Wed, 13 Sep 2017 16:33:34 +0000 (09:33 -0700)]
Bluetooth: thread-safe callback invocation
Bug:
65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7
(cherry picked from commit
3eb569fc72781857f1f2722bb645a6090a9b53ce)
Jakub Pawlowski [Thu, 14 Sep 2017 02:32:28 +0000 (02:32 +0000)]
Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 01:43:50 +0000 (01:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours am:
98313f5996 -s ours am:
95dd448a5e -s ours
am:
abc3417961 -s ours
Change-Id: I61c531101305b5875be83847991d4514cc773511
Bill Yi [Thu, 14 Sep 2017 01:39:21 +0000 (01:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours am:
8eb6ff0212 -s ours am:
c8ede1e966 -s ours
am:
ea94475791 -s ours
Change-Id: I2c90c8467634d338d1eebe8cdfdfa0de6cb0902b
TreeHugger Robot [Thu, 14 Sep 2017 01:35:42 +0000 (01:35 +0000)]
Merge "vendor apk is unbundled" into oc-mr1-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 01:35:01 +0000 (01:35 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours am:
8d1cdbb135 -s ours am:
1186c6ec45 -s ours" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 01:25:22 +0000 (01:25 +0000)]
Merge "Fixed an issue where the pattern wouldn't show properly" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 01:24:43 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours am:
8d1cdbb135 -s ours
am:
1186c6ec45 -s ours
Change-Id: I44ea9e39a0c4dfcf5da7d0415d6c941a2a93d686
Bill Yi [Thu, 14 Sep 2017 01:17:51 +0000 (01:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours am:
fc0a43743e -s ours am:
8d0a15c4f5 -s ours
am:
3989c8b1f7 -s ours
Change-Id: I607c1016f3eb395ebc015e362c00d4ac1914e1ce
Bill Yi [Thu, 14 Sep 2017 01:14:07 +0000 (01:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours am:
b7c6238556 -s ours am:
a690e7362d -s ours
am:
2dd51799b2 -s ours
Change-Id: I0594a7e4f0eaaa2ab607ecbf6dab50e64d72fe33
Bill Yi [Thu, 14 Sep 2017 01:05:27 +0000 (01:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
5b812c8df6 -s ours am:
98313f5996 -s ours
am:
95dd448a5e -s ours
Change-Id: I9dabad9b8dbfb88c9c41fb9334730e3d9a13b822
Bill Yi [Thu, 14 Sep 2017 01:01:00 +0000 (01:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b69531f99e -s ours am:
16bc5f15b7 -s ours am:
69259c2b32 -s ours
am:
9ebfe48df5 -s ours
Change-Id: Id4c8b1da2079dcc92deefbecd6faa18df2651597
Bill Yi [Thu, 14 Sep 2017 01:00:57 +0000 (01:00 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
b53e9cf4a2 -s ours am:
8eb6ff0212 -s ours
am:
c8ede1e966 -s ours
Change-Id: Ic177de299decf09261daf18f8a0b779bf10727de
Bill Yi [Thu, 14 Sep 2017 00:54:20 +0000 (00:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
37f29b0359 -s ours am:
4f8b486f69 -s ours am:
0dd2e975ca -s ours
am:
bcbc39e695 -s ours
Change-Id: I875a747924bd5f89ae7b73b6282bd9cd878c5c71
Bill Yi [Thu, 14 Sep 2017 00:53:06 +0000 (00:53 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c00cf0a49d -s ours am:
2b492b6502 -s ours
am:
8d1cdbb135 -s ours
Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666
Bill Yi [Thu, 14 Sep 2017 00:49:39 +0000 (00:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7cc053233b -s ours am:
fc0a43743e -s ours
am:
8d0a15c4f5 -s ours
Change-Id: I69b7c005b4dc5b4c63743a7a315bf2aa3e4e290a
Bill Yi [Thu, 14 Sep 2017 00:47:57 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
f9075cb448 -s ours am:
c0ccea9bf5 -s ours am:
4e72aa2314 -s ours
am:
797dca48c9 -s ours
Change-Id: Ie697f29340feabdd2f5c0c729afbe6ba571f119f
Bill Yi [Thu, 14 Sep 2017 00:39:22 +0000 (00:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c016ef25c8 -s ours am:
318728fd6b -s ours am:
9ce3cc9c78 -s ours
am:
0973e9a34e -s ours
Change-Id: I7246fb14f24a8ed13fe663570672a95c196f4210
Bill Yi [Thu, 14 Sep 2017 00:37:57 +0000 (00:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7804b17f0e -s ours am:
b7c6238556 -s ours
am:
a690e7362d -s ours
Change-Id: Iffe01cedcfb01c31c9f89e3ddb459552934fb000
Bill Yi [Thu, 14 Sep 2017 00:35:58 +0000 (00:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9f5e95f64e -s ours am:
697f149acf -s ours am:
b5b1b7b505 -s ours
am:
eb29e3e357 -s ours
Change-Id: Iebb6da5d93e09f986e8092107b363b869efd7a05
Android Build Merger (Role) [Thu, 14 Sep 2017 00:31:51 +0000 (00:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours am:
ac23d4afac -s ours" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 00:30:00 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
79bfe12e6b -s ours am:
1db479ee26 -s ours am:
1ff18ac097 -s ours
am:
ac23d4afac -s ours
Change-Id: I3d314ff51d4294f927ef3eb7df257502c6326626
Android Build Merger (Role) [Thu, 14 Sep 2017 00:28:25 +0000 (00:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e5fe30c1b0 -s ours am:
9abe093864 -s ours am:
4c152ae488 -s ours am:
4379f07401 -s ours" into oc-mr1-dev