OSDN Git Service
Jean-Michel Trivi [Thu, 24 Aug 2017 19:42:48 +0000 (19:42 +0000)]
Merge "Audio event logging" into oc-mr1-dev am:
9961d6968e
am:
87dfc5bb4e
Change-Id: Ief454ea5fd405cb902a06851d3b5e966266c84e4
TreeHugger Robot [Thu, 24 Aug 2017 19:35:44 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Beverly [Thu, 24 Aug 2017 19:27:07 +0000 (19:27 +0000)]
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev am:
8f5c9de97e
am:
62ffcb36c9
Change-Id: I80dbc3cb1eed565a3f5aea1bbc89b31bc4a03b4e
Roozbeh Pournader [Thu, 24 Aug 2017 19:24:06 +0000 (19:24 +0000)]
Merge "Use fallback-based line spacing in TextView etc"
Jean-Michel Trivi [Thu, 24 Aug 2017 19:21:44 +0000 (19:21 +0000)]
Merge "Audio event logging" into oc-mr1-dev
am:
9961d6968e
Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7
Beverly [Thu, 24 Aug 2017 19:15:13 +0000 (19:15 +0000)]
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
am:
8f5c9de97e
Change-Id: I32322f1b788bf3a55d92425485d98b58f7b524c7
TreeHugger Robot [Thu, 24 Aug 2017 19:04:47 +0000 (19:04 +0000)]
Merge "Audio event logging" into oc-mr1-dev
Matthew Ng [Thu, 24 Aug 2017 19:02:41 +0000 (19:02 +0000)]
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev am:
b952c7557e
am:
5e4f6dad0c
Change-Id: I27789aee6e8b64e7cf63c0a52bdeba0ade2e63c3
TreeHugger Robot [Thu, 24 Aug 2017 19:01:55 +0000 (19:01 +0000)]
Merge "Consistently uses ASCII numbers in notif category translation." into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 18:48:25 +0000 (18:48 +0000)]
Merge "Fix assert_premultiplied assert"
Matthew Ng [Thu, 24 Aug 2017 18:47:48 +0000 (18:47 +0000)]
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
am:
b952c7557e
Change-Id: I66e78a3eb612a16d9dfcac749cb68c4f9e2e7334
Selim Cinek [Thu, 24 Aug 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev am:
a782ff3fb7
am:
3490fd43a6
Change-Id: I601ad9df09c5dd3682cac7e81116ebc77c5d2ddf
TreeHugger Robot [Thu, 24 Aug 2017 18:38:07 +0000 (18:38 +0000)]
Merge "Test for writing and loading reduced resolution task snapshots" into oc-mr1-dev
Roozbeh Pournader [Thu, 24 Aug 2017 18:38:00 +0000 (18:38 +0000)]
Merge "Support fallback linespacing in DynamicLayout"
David Stevens [Thu, 24 Aug 2017 18:29:38 +0000 (18:29 +0000)]
Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev am:
06610fc753
am:
e634b8ffed
Change-Id: I80b212116a327ae453f0a505606e9a64eac591f4
Selim Cinek [Thu, 24 Aug 2017 18:28:02 +0000 (18:28 +0000)]
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev
am:
a782ff3fb7
Change-Id: I03f6527ae3ebd36b6df26a8d3a786157ce8a1d90
Yi Jin [Thu, 24 Aug 2017 18:24:36 +0000 (18:24 +0000)]
Merge "Implement PII stripper in incidentd, part 1"
David Stevens [Thu, 24 Aug 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev
am:
06610fc753
Change-Id: I5d282da0356955dd5ca472828d9e0e2d4db7d36b
TreeHugger Robot [Thu, 24 Aug 2017 18:08:05 +0000 (18:08 +0000)]
Merge "Fixed a bug where we weren't releasing views" into oc-mr1-dev
David Stevens [Thu, 24 Aug 2017 17:57:50 +0000 (17:57 +0000)]
Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev
Roozbeh Pournader [Thu, 24 Aug 2017 17:39:14 +0000 (17:39 +0000)]
Merge "Add a builder for DynamicLayout and switch TextView to it"
Wale Ogunwale [Thu, 24 Aug 2017 17:32:08 +0000 (17:32 +0000)]
Merge "Migrated some windowing methods from StackId to WindowConfiguration"
Bill Yi [Thu, 24 Aug 2017 17:18:37 +0000 (17:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
f15c825dfb -s ours
am:
e60d71b705 -s ours
Change-Id: I1fa3b358bae6beb74d0b42528d80e7a95755f86c
Bill Yi [Thu, 24 Aug 2017 17:03:10 +0000 (17:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
1c1e7095f3 -s ours" into oc-mr1-dev-plus-aosp
am:
0497f43e80 -s ours
Change-Id: I7bb12539e6be02e39a8b57e293f872cf47432ce1
Bill Yi [Thu, 24 Aug 2017 16:54:00 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f15c825dfb -s ours
Change-Id: I88443420743364bf148b0200e12efcf27cc92df3
Bill Yi [Thu, 24 Aug 2017 16:53:06 +0000 (16:53 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
1040e35e55 -s ours" into oc-mr1-dev-plus-aosp
am:
8c169398f3 -s ours
Change-Id: Ia29e057158359e9b607659c8d5297632196e0b2f
Bill Yi [Thu, 24 Aug 2017 16:45:37 +0000 (16:45 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
f8376b0642 -s ours" into oc-mr1-dev-plus-aosp
am:
42eb53372d -s ours
Change-Id: Ie8b31c81f534d170332c1d50c6235c568e6f32bf
Android Build Merger (Role) [Thu, 24 Aug 2017 16:41:17 +0000 (16:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
1c1e7095f3 -s ours" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 24 Aug 2017 16:36:57 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 16:36:52 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours
am:
1c1e7095f3 -s ours
Change-Id: I349f775c0891b8986ccc17330e2f35086975a947
Android Build Merger (Role) [Thu, 24 Aug 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
1040e35e55 -s ours" into oc-mr1-dev-plus-aosp
Chris Thornton [Thu, 24 Aug 2017 16:31:19 +0000 (16:31 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev am:
0a14929b77
am:
edb86c3933
Change-Id: Ia298587cd12331206038f70ddc949782105558f0
Bill Yi [Thu, 24 Aug 2017 16:30:24 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1040e35e55 -s ours
Change-Id: I1acae1559def3df17786e6a5a120d24bd07adf54
Android Build Merger (Role) [Thu, 24 Aug 2017 16:29:02 +0000 (16:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours am:
f8376b0642 -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 24 Aug 2017 16:26:01 +0000 (16:26 +0000)]
Merge "Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev am:
efeb2cf943 am:
5bb0b23009"
Bill Yi [Thu, 24 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
7175b7b929 -s ours
am:
f8376b0642 -s ours
Change-Id: I6120226cd003e9fdabfe68b2eb321752cb565abd
TreeHugger Robot [Thu, 24 Aug 2017 16:23:46 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Chris Thornton [Thu, 24 Aug 2017 16:20:08 +0000 (16:20 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
am:
0a14929b77
Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a
Selim Cinek [Thu, 24 Aug 2017 16:20:08 +0000 (16:20 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev am:
efeb2cf943
am:
5bb0b23009
Change-Id: Idd5f01b747a46d76296197cd62961f600aad9fa4
Bill Yi [Thu, 24 Aug 2017 16:12:45 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7175b7b929 -s ours
Change-Id: I4be65bdb164ecf13c5d89316fb12d32ca69d8bb6
Bill Yi [Thu, 24 Aug 2017 16:11:23 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7175b7b929 -s ours
Change-Id: I45956469aa428467ffb7039288cd99a177566083
TreeHugger Robot [Thu, 24 Aug 2017 16:10:01 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 16:08:21 +0000 (16:08 +0000)]
Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev
Selim Cinek [Thu, 24 Aug 2017 16:07:37 +0000 (16:07 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
am:
efeb2cf943
Change-Id: I3e46e13d5e84a5e45849ca15d716486f1032bc4f
TreeHugger Robot [Thu, 24 Aug 2017 16:06:45 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Jean-Michel Trivi [Sun, 20 Aug 2017 01:08:06 +0000 (18:08 -0700)]
Audio event logging
New class AudioEventLogger to store a configurable number of the
last audio events. It hosts a circular buffer of lightweight
event objects, an abstract class whose implementations are
event-specific, and does the heavier string manipulations
at the time of the dump, not during normal operation.
Add logging for:
- phone state (a.k.a. audio mode) changes
- wired device connections
- playback activity monitor
- force use
Test: adb shell dumpsys audio
Bug:
64470715
Change-Id: I8dbd936e2ffec39134f1a8837191c74f5cb9fc56
TreeHugger Robot [Thu, 24 Aug 2017 16:01:06 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 24 Aug 2017 16:00:20 +0000 (16:00 +0000)]
Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
Wale Ogunwale [Thu, 27 Jul 2017 15:55:03 +0000 (08:55 -0700)]
Migrated some windowing methods from StackId to WindowConfiguration
First pass at transitioning away from using stack ids for windowing mode
to WindowConfiguration. Added some TODO that will require the introduction
of applicationType in WindowConfiguration before additional conversation
can be done.
Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: go/wm-smoke
Change-Id: I2b315623faa16445a9f942e082089123842cb5a1
Selim Cinek [Wed, 23 Aug 2017 17:59:57 +0000 (10:59 -0700)]
Fixed a bug where we weren't releasing views
When tracking with the headsuptouchhelper, views
would not be released properly, since we're handing
over the touch to the panel.
This is now fixed.
Test: drag down on heads-up, observe normal motion
Change-Id: Ia9eef07c789d6d03098c2e34f86c16fdeeb93d42
Fixes:
37314754
TreeHugger Robot [Thu, 24 Aug 2017 15:54:53 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 24 Aug 2017 15:53:04 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 24 Aug 2017 15:45:04 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Stan Iliev [Wed, 23 Aug 2017 20:25:33 +0000 (16:25 -0400)]
Fix assert_premultiplied assert
Fix assert_premultiplied triggered, when a hardware bitmap is
created. This happens for both pipelines.
Test: Ran CtsUiRenderingTestCases.
Change-Id: Iffe71a560466b672f755708354535ba8affcced2
Tyler Gunn [Thu, 24 Aug 2017 15:18:01 +0000 (15:18 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev am:
ac3c798ab5
am:
6cca8ade9e
Change-Id: I913b1e2986d91d523442679f3e724dafb309b128
Tyler Gunn [Thu, 24 Aug 2017 15:06:22 +0000 (15:06 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
am:
ac3c798ab5
Change-Id: I80a22e7fdb0272313c8d9f98b6360c6d235e37ac
Tyler Gunn [Thu, 24 Aug 2017 15:01:52 +0000 (15:01 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario." into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 14:38:05 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd8f59fe4f495aed5b9d3e0b04353e93e9489ba1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jack He [Thu, 24 Aug 2017 13:50:48 +0000 (13:50 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev am:
34eac2c59b
am:
10edd06b15
Change-Id: Ieb0ac6a65d7e56b074832f3909f9becbc5012b5b
Jorim Jaggi [Thu, 24 Aug 2017 13:38:45 +0000 (13:38 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev am:
f1ef6ef742
am:
2b99571564
Change-Id: Iae4b6dd49ba82cff1ba17b0d1265a085e1ad459e
Jack He [Thu, 24 Aug 2017 13:35:19 +0000 (13:35 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
am:
34eac2c59b
Change-Id: I9ccc78cf03a37f80d3ba10408050a0b847bc2c7a
TreeHugger Robot [Thu, 24 Aug 2017 13:29:28 +0000 (13:29 +0000)]
Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev
Jorim Jaggi [Thu, 24 Aug 2017 13:26:16 +0000 (13:26 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
am:
f1ef6ef742
Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11
Jorim Jaggi [Thu, 24 Aug 2017 13:19:42 +0000 (13:19 +0000)]
Merge "Sleep activities with AOD" into oc-mr1-dev
TreeHugger Robot [Thu, 24 Aug 2017 13:06:13 +0000 (13:06 +0000)]
Merge "Expand the animation from the user's last touch point"
Bill Yi [Thu, 24 Aug 2017 12:34:18 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f99c721a813e8cc9c1334ee16146e770c2eebca
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 24 Aug 2017 12:25:01 +0000 (05:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4d51561a5288b8d58b741214fcd07acc3ec569a
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Thu, 24 Aug 2017 12:11:32 +0000 (05:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I38d45e58136a2823cda74f3dbfb39c43b9ebe180
Bill Yi [Thu, 24 Aug 2017 11:45:00 +0000 (04:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2959046c2f999af3354d056b97111740633d3c1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Narayan Kamath [Thu, 24 Aug 2017 11:37:39 +0000 (11:37 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev am:
0d9c30cf88
am:
95477fe682
Change-Id: Ib4799af8021787d8d52e159bf9edb0da5f006b6f
Bill Yi [Thu, 24 Aug 2017 11:36:54 +0000 (04:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I211e5fccf4cda8ac04cc8718488ff5d1e9ebbe4b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Narayan Kamath [Thu, 24 Aug 2017 11:27:31 +0000 (11:27 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
am:
0d9c30cf88
Change-Id: Ib8e91584604ab4abf46c53b35aa2b6be70a23f8a
Bill Yi [Thu, 24 Aug 2017 11:18:53 +0000 (04:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied6de9cbe69d8c72f9ba8c0095451a175f02d4dd
TreeHugger Robot [Thu, 24 Aug 2017 11:18:31 +0000 (11:18 +0000)]
Merge "sounds : Add a makefile for Android Go specific sounds." into oc-mr1-dev
Lorenzo Colitti [Thu, 24 Aug 2017 11:17:28 +0000 (11:17 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev am:
9487f80cc5
am:
06e3e912b2
Change-Id: I335fdb5f3053569036608300f8a324a840517cde
Lorenzo Colitti [Thu, 24 Aug 2017 11:03:38 +0000 (11:03 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
am:
9487f80cc5
Change-Id: Iad2aad7163aea9b1b92ed3f46be7ce36cd0578c6
TreeHugger Robot [Thu, 24 Aug 2017 10:55:20 +0000 (10:55 +0000)]
Merge "Trivial change to test expectations." into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 10:52:49 +0000 (03:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ia2ef45e82949155e201cf8e7e058ca9e8ab0833b
Alexandru-Andrei Rotaru [Thu, 24 Aug 2017 10:29:43 +0000 (10:29 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev am:
afe28cdf7e
am:
83f6c7f7a6
Change-Id: I0dcc005d46e562afdf329c1dd57c985e4ce651ea
Alexandru-Andrei Rotaru [Thu, 24 Aug 2017 10:17:37 +0000 (10:17 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am:
afe28cdf7e
Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09
TreeHugger Robot [Thu, 24 Aug 2017 10:08:15 +0000 (10:08 +0000)]
Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 09:55:03 +0000 (02:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I202d46f1c46d55840ebbdc242fbd14fbdfe07c32
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jack He [Mon, 24 Jul 2017 21:55:59 +0000 (14:55 -0700)]
Bluetooth: Add flag for human readable name
* Add hasHumanReadableName() method to CachedBluetoothDevice that
returns True when BluetoothDevice.getAliasName() is not null nor empty
Bug:
34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: I197f3f7f3bcb7d785729473b25638006449ae862
Jack He [Thu, 24 Aug 2017 08:59:22 +0000 (08:59 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev am:
cb065bc33e
am:
ac2afd4e78
Change-Id: Ia37942f5cc750f6e605aa7b9091a51298dc2af0a
Jack He [Thu, 24 Aug 2017 08:45:07 +0000 (08:45 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
am:
cb065bc33e
Change-Id: I089e0f69629666d21bc401c2191341a71d7c3172
TreeHugger Robot [Thu, 24 Aug 2017 08:34:39 +0000 (08:34 +0000)]
Merge "CachedBluetoothDevice: Rename mVisible to mJustDiscovered" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 08:28:16 +0000 (08:28 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
767ca11384 -s ours
am:
2fd6220a26 -s ours
Change-Id: Ia3a8f2434e6edb2795ac67ce363f6d4bcde75c00
TreeHugger Robot [Thu, 24 Aug 2017 08:25:01 +0000 (08:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 24 Aug 2017 08:15:23 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
e7527d1334 -s ours" into oc-mr1-dev-plus-aosp
am:
16bead770e -s ours
Change-Id: I54b6025846fa5f52d3a321da165ca7685c147526
Bill Yi [Thu, 24 Aug 2017 08:10:53 +0000 (08:10 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
767ca11384 -s ours
Change-Id: I6a46c18871f77a0f97c2498dc1595bd29e1e6575
Bill Yi [Thu, 24 Aug 2017 08:09:55 +0000 (08:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
0309d32f3e -s ours
am:
714c11a3ab -s ours
Change-Id: Ieed45f0cae6f1236b316700fba936a61fad7df01
Android Build Merger (Role) [Thu, 24 Aug 2017 08:07:04 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE am:
b4f16b10af -s ours am:
e7527d1334 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 24 Aug 2017 08:03:28 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
b4f16b10af -s ours
am:
e7527d1334 -s ours
Change-Id: Id460576d6660c50202833d7eab6152c45213951a
Bill Yi [Thu, 24 Aug 2017 07:58:50 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
0309d32f3e -s ours
Change-Id: I3982df3278279f1debb6b2e578393edbc37b356a
Bill Yi [Thu, 24 Aug 2017 07:54:49 +0000 (07:54 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81
TreeHugger Robot [Thu, 24 Aug 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 24 Aug 2017 07:50:24 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE
am:
b4f16b10af -s ours
Change-Id: I0b3cf2e8204f78f342754b06988bd63344e72fa7
Erik Kline [Thu, 24 Aug 2017 06:09:40 +0000 (06:09 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1 am:
df2a880775 am:
64f6edc7fa -s ours
am:
04c8a76c96 -s ours
Change-Id: Ic0fc4059894126248e00a46d8cefe13efa8a1f6f
Erik Kline [Thu, 24 Aug 2017 05:56:56 +0000 (05:56 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1 am:
df2a880775
am:
64f6edc7fa -s ours
Change-Id: I604ec95dec7466831a29526217308bb869326229
Erik Kline [Thu, 24 Aug 2017 05:44:58 +0000 (05:44 +0000)]
Merge changes from topic "offload_cherrypick" am:
b09cf3fbf1
am:
df2a880775
Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872
OSDN Git Service
