OSDN Git Service
Brad Ebinger [Tue, 10 Oct 2017 23:05:50 +0000 (23:05 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev
am:
74f88fe858 -s ours
Change-Id: I63b64247707f2bb14b1cba3b0a6278eeb36a363e
Brad Ebinger [Tue, 10 Oct 2017 22:47:18 +0000 (22:47 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" into oc-mr1-dev
Hyunyoung Song [Tue, 10 Oct 2017 22:30:23 +0000 (22:30 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
am:
384689934d
Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52
TreeHugger Robot [Tue, 10 Oct 2017 22:22:38 +0000 (22:22 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 21:29:12 +0000 (21:29 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b am:
dcb8cf8732
am:
0db4c361e3
Change-Id: I10e61d65cd05c8d93d43a2fefee841023ec35889
Andreas Gampe [Tue, 10 Oct 2017 21:20:18 +0000 (21:20 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b
am:
dcb8cf8732
Change-Id: I11119803f2176704e1f7ca8a36e7b62cf93f377b
Andreas Gampe [Tue, 10 Oct 2017 21:11:10 +0000 (21:11 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
am:
7d1789867b
Change-Id: If6e464f6840b66deb6f6c61b0ca96d847444e910
Treehugger Robot [Tue, 10 Oct 2017 20:57:55 +0000 (20:57 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Bug:
67640102
Merged-In: I25b39008317e333d422cd32a0c6348c010ca280f
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Hyunyoung Song [Tue, 10 Oct 2017 17:35:59 +0000 (10:35 -0700)]
Wrap StackOverflowError in NotFoundException.
Bug:
67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
Brad Ebinger [Tue, 10 Oct 2017 18:57:23 +0000 (18:57 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9 am:
3b6df532f3
am:
8765abcc9e
Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
Brad Ebinger [Tue, 10 Oct 2017 18:48:08 +0000 (18:48 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9
am:
3b6df532f3
Change-Id: I4d9031d32f59953d7b86cf361635c7d7f08fdf32
Brad Ebinger [Tue, 10 Oct 2017 18:39:56 +0000 (18:39 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am:
432c2b0fb9
Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
Brad Ebinger [Tue, 10 Oct 2017 18:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
Michael Wright [Tue, 10 Oct 2017 18:09:49 +0000 (18:09 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
am:
33238f213f
Change-Id: Ie20f60f76ddce6c634df005ecd4d7f7d9d0d9651
Andreas Gampe [Tue, 10 Oct 2017 18:01:22 +0000 (18:01 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9 am:
cb34bdf55c
am:
7934a7f828
Change-Id: I5c2819892170855c4d009261785f9e8d26f9ad5e
Andreas Gampe [Tue, 10 Oct 2017 17:52:50 +0000 (17:52 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9
am:
cb34bdf55c
Change-Id: Idd444cd9dfe78d4200f67a4fe6b3c4fb13767f29
Michael Wright [Tue, 10 Oct 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Parcel: Avoid NPE in finalization"
am:
b085deece9
Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
Brad Ebinger [Tue, 10 Oct 2017 17:26:22 +0000 (17:26 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
am:
ad545464c2 -s ours
Change-Id: I9285e05fb9278057240769648c3fa23c2b271ced
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"
Brad Ebinger [Tue, 10 Oct 2017 17:14:35 +0000 (17:14 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 17:10:24 +0000 (17:10 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018 am:
812b09d6bd
am:
7f49276388
Change-Id: I6947796df7a7673081d30a38f529be239b7defaf
Andreas Gampe [Tue, 10 Oct 2017 16:58:40 +0000 (16:58 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018
am:
812b09d6bd
Change-Id: I6ee5bbd2923ef7561739eb5cd14471ae87528a72
Andreas Gampe [Tue, 10 Oct 2017 16:50:37 +0000 (16:50 +0000)]
Merge "{Event,Security}Log: Unify code"
am:
0c614c7018
Change-Id: Id43119d11e27b0e0f6bf064e3aa76f8c990b64a4
Andrew Solovay [Tue, 10 Oct 2017 16:42:31 +0000 (16:42 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
am:
c4a0b34248
Change-Id: I96c464236f694b194e9f5a6aba68b40ad840035d
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"
Andrew Solovay [Tue, 10 Oct 2017 16:29:06 +0000 (16:29 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 16:09:26 +0000 (09:09 -0700)]
LoggingPrintStream: Make visible for testing
The class must be public to avoid test issues. If the class is
package-private, the test would have to be in the boot class-
path:
Rejecting re-init on previously-failed class java.lang.Class<com.android.internal.os.LoggingPrintStreamTest$TestPrintStream>: java.lang.IllegalAccessError: Class com.android.internal.os.LoggingPrintStream extended by class com.android.internal.os.LoggingPrintStreamTest$TestPrintStream is inaccessible (declaration of 'com.android.internal.os.LoggingPrintStreamTest$TestPrintStream' appears in /data/app/com.android.frameworks.coretests-SD7GJmYE507ACoE9gu2mnw==/base.apk)
at java.lang.Object java.lang.reflect.Constructor.newInstance0(java.lang.Object[]) (Constructor.java:-2)
at java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[]) (Constructor.java:334)
at junit.framework.Test junit.framework.TestSuite.createTest(java.lang.Class, java.lang.String) (TestSuite.java:61)
Test: m
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java
Change-Id: I26cead7954cf4309c8b3e16994c35a3f4a9eb798
Andreas Gampe [Tue, 10 Oct 2017 15:01:38 +0000 (08:01 -0700)]
Parcel: Avoid NPE in finalization
Check whether the guard is null to avoid:
Uncaught exception thrown by finalizer
java.lang.NullPointerException: Attempt to invoke virtual method 'void dalvik.system.CloseGuard.close()' on a null object reference
at android.os.ParcelFileDescriptor.closeWithStatus(ParcelFileDescriptor.java:740)
at android.os.ParcelFileDescriptor.finalize(ParcelFileDescriptor.java:990)
at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
at java.lang.Daemons$Daemon.run(Daemons.java:103)
at java.lang.Thread.run(Thread.java:764)
Follow-up to commit
da5a3e12f4f8f965c57d6f93c74190f43ea233f3.
Bug:
7426029
Bug:
10330121
Test: m
Change-Id: I903f1545ab784008727ff23bb95fe182bd95b62a
Hugo Benichi [Tue, 10 Oct 2017 14:31:48 +0000 (14:31 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7 am:
e3b6b636cf
am:
a63788076a
Change-Id: Ife901fd1c9c30b3864ddce61326f2d5caacd0bae
Hugo Benichi [Tue, 10 Oct 2017 14:21:57 +0000 (14:21 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7
am:
e3b6b636cf
Change-Id: I8c639ddce8408d302f0aede2490d226ca9c4bd8c
Hugo Benichi [Tue, 10 Oct 2017 14:13:45 +0000 (14:13 +0000)]
Merge "LinkProperties: fix some indentation issues"
am:
a162726df7
Change-Id: If9bc7cf980aa14880dbf6cc43bc86cc269d306cb
Treehugger Robot [Tue, 10 Oct 2017 14:02:35 +0000 (14:02 +0000)]
Merge "LinkProperties: fix some indentation issues"
Hugo Benichi [Tue, 10 Oct 2017 07:29:06 +0000 (16:29 +0900)]
LinkProperties: fix some indentation issues
Test: no functional change
Change-Id: I469bba154feb382156e56043d83f066a5bd658aa
Jaewan Kim [Tue, 10 Oct 2017 05:51:41 +0000 (05:51 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
am:
9bc71c4922
Change-Id: I3806838a0cd2e4ebe6bdf27fafcd22afe177bb22
TreeHugger Robot [Tue, 10 Oct 2017 05:44:55 +0000 (05:44 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
Andreas Gampe [Mon, 9 Oct 2017 23:21:11 +0000 (16:21 -0700)]
{Event,Security}Log: Unify code
Extract common code into eventlog_helper.
Bug:
67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: Idafad832385f57c22f40dbb8570e95da6d44f08f
Andrew Solovay [Sat, 7 Oct 2017 02:02:28 +0000 (19:02 -0700)]
docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.
Test: make ds-docs
Bug:
67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
Andrew Solovay [Tue, 10 Oct 2017 01:35:20 +0000 (01:35 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
am:
64b23cca4d
Change-Id: I4d71688ec991555d400e5ce86baad61270bba9b9
Andrew Solovay [Tue, 10 Oct 2017 01:19:14 +0000 (01:19 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Andreas Gampe [Mon, 9 Oct 2017 23:45:11 +0000 (23:45 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1 am:
f8fa4b8352
am:
d145cab07b
Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97
Andreas Gampe [Mon, 9 Oct 2017 23:37:08 +0000 (23:37 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1
am:
f8fa4b8352
Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113
Andreas Gampe [Mon, 9 Oct 2017 23:30:04 +0000 (23:30 +0000)]
Merge "EventLog: Check for exception after add()"
am:
c30a6ac2f1
Change-Id: I17768ab21d49afbc943702803293b8cd47804e5c
Chad Brubaker [Mon, 9 Oct 2017 23:26:26 +0000 (23:26 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev
am:
cffe04a719
Change-Id: I35ca80db5df3cce385020e3192f82f38d6c033d7
Treehugger Robot [Mon, 9 Oct 2017 23:15:50 +0000 (23:15 +0000)]
Merge "EventLog: Check for exception after add()"
TreeHugger Robot [Mon, 9 Oct 2017 23:14:25 +0000 (23:14 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev
Andreas Gampe [Mon, 9 Oct 2017 23:13:59 +0000 (23:13 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6 am:
a25528b085
am:
1802fc7882
Change-Id: Ieaa64b9a5f92ccaed1ede82811ceab1f1224229c
Andreas Gampe [Mon, 9 Oct 2017 22:58:57 +0000 (22:58 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6
am:
a25528b085
Change-Id: Id6e6138b23c962bcd248e12de67e485782bb13aa
Andreas Gampe [Mon, 9 Oct 2017 22:49:04 +0000 (22:49 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
am:
a98866a6b6
Change-Id: I42aa318daa851c634531e9b0868437a16a59abdd
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug:
66986066
Test: Manual, PIN/PUK locked SIM
Merged-In: Id8ca403a839cff994970c370973a91e8e5688722
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
Treehugger Robot [Mon, 9 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
Makoto Onuki [Mon, 9 Oct 2017 21:28:23 +0000 (21:28 +0000)]
Don't take a lock on the UI thread.
am:
d4b7862785
Change-Id: Iae6c7832c7ac1c853b3e7aee19c23442e87cebfb
Andreas Gampe [Mon, 9 Oct 2017 15:25:36 +0000 (08:25 -0700)]
EventLog: Check for exception after add()
When reading events, calling Collection.add() may result in an
OutOfMemoryError or immutability error. Check for an exception
after the call in EventLog and SecurityLog.
Bug:
67511924
Test: m
Test: Device boots
Change-Id: If0fbf6b01051b5311eeb88d3f52470cd8b1eec59
Makoto Onuki [Sat, 23 Sep 2017 00:22:50 +0000 (17:22 -0700)]
Don't take a lock on the UI thread.
Bug
66719356
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Change-Id: I1045eda4910e3c7d3172038a1efd31cdf9346729
Andreas Gampe [Mon, 9 Oct 2017 19:01:25 +0000 (12:01 -0700)]
SecurityLog: Apply
7b25bb8 to SecurityLog
Apply logging rewrites from commit
7b25bb8ec79e420e9655a00301cbca80a38cde2d
to SecurityLog.
Test: manual confirm event log messages from services continue
Bug:
31992412
Bug:
31456426
Change-Id: If482a89690fa9fd1da6b5e13398df4bab47ca200
Lucas Dupin [Mon, 9 Oct 2017 18:11:40 +0000 (18:11 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
am:
c856aa18e3
Change-Id: Ia9a137a7d7d4e0b170dabdae7aa5fd4253255a6e
TreeHugger Robot [Mon, 9 Oct 2017 18:01:54 +0000 (18:01 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
Chad Brubaker [Mon, 9 Oct 2017 17:50:46 +0000 (10:50 -0700)]
Expose RECORD_AUDIO to Instant Apps
This runtime permission should have been exposed to Instant Apps but
incorrectly was not
Bug:
67578813
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: Icad01cc8e99f52c6e638f54aaf78e9cc56475fc4
Rubin Xu [Mon, 9 Oct 2017 16:50:30 +0000 (16:50 +0000)]
Always synchronize the OEM unlock allowed bit to the FRP partition
am:
2257fda563
Change-Id: Iaa6299176ab871c41022c499f57e693ce3f36c96
Rubin Xu [Fri, 6 Oct 2017 11:07:32 +0000 (12:07 +0100)]
Always synchronize the OEM unlock allowed bit to the FRP partition
For devices using OEMLock HAL, OEM unlock allowed bit is maintained by the HAL.
However PersistentDataBlockService will only look at the OEM unlock allowed bit
on the pst partition to make sure FRP data is cleared on a unlockable device.
As a short term fix, make sure the OEM unlock allowed bit on both the HAL and pst
partition is always in sync.
Bug:
67043266
Test: On walleye/taimen, add an account, enable OEM unlock, factory reset
via fastboot, and observe FRP is not enforced.
Change-Id: Id4a0d81d7a424e17c2751e7e65582b51c14bd073
Michael Wright [Thu, 5 Oct 2017 18:04:14 +0000 (14:04 -0400)]
Ignore non-repeating vibrations in favor of repeating vibrations.
This way we don't inadvertently cancel things like alarms and ring
tone vibrations in favor of one shot vibrations, which are typically
shorter and meant to be feedback rather than attention getting.
Test: start alarm, hit home button, see alarm vibration isn't cancelled.
Bug:
65621937
Change-Id: Ib7fcaea7bc7f101d738b72112c8d5096c4b34ca2
Android Build Merger (Role) [Sun, 8 Oct 2017 23:12:24 +0000 (23:12 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours am:
748d6e3404 -s ours am:
62aaa59341 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sun, 8 Oct 2017 23:10:24 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours am:
748d6e3404 -s ours
am:
62aaa59341 -s ours
Change-Id: Iec5ad85b735408b928e0a282a6e7ec0e30a7e4af
Bill Yi [Sun, 8 Oct 2017 23:05:13 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours am:
748d6e3404 -s ours
am:
6a8f482687 -s ours
Change-Id: I3b8f7192433c9c1aa0d9587e5b3af6743ebae598
Bill Yi [Sun, 8 Oct 2017 22:57:18 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours
am:
748d6e3404 -s ours
Change-Id: I5709f46bc7d85dd8de4a205cb8b7e1aaac71c0f0
Bill Yi [Sun, 8 Oct 2017 22:57:14 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2758e3af09 -s ours
am:
748d6e3404 -s ours
Change-Id: I30d9c967e92847e096a29761cb275e3dcd631789
Bill Yi [Sun, 8 Oct 2017 22:49:38 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
18fb169068 -s ours
Change-Id: I10e8b09c9bd167db5f27e6f2739ab417149779ef
Bill Yi [Sun, 8 Oct 2017 22:45:57 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2758e3af09 -s ours
Change-Id: I84cd6ad222b419aee8c31c26a07922dd5c7d6746
Bill Yi [Sun, 8 Oct 2017 22:43:38 +0000 (22:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
cec54ab2ae -s ours
Change-Id: Ifef4e9a5e87630d93b45666c1851aafc28aca708
TreeHugger Robot [Sun, 8 Oct 2017 22:34:13 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 8 Oct 2017 22:32:15 +0000 (22:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Sun, 8 Oct 2017 22:30:10 +0000 (22:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 8 Oct 2017 16:14:18 +0000 (09:14 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id495007a4f0069772a79e8abbd5e1a8bcfe6db92
Bill Yi [Sun, 8 Oct 2017 16:01:34 +0000 (09:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I317a9c13c04792c41f276258c095813298379366
Bill Yi [Sun, 8 Oct 2017 15:10:15 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
1c5bd422fd -s ours
am:
398be102c0 -s ours
Change-Id: I53cc321bfcc29cebe8fc9df9353c2c1515570a0d
Bill Yi [Sun, 8 Oct 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
1c5bd422fd -s ours
am:
26cd97011f -s ours
Change-Id: I822296d354d433bb7cb26583fed41a31ef4f5825
Bill Yi [Sun, 8 Oct 2017 14:57:18 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1c5bd422fd -s ours
Change-Id: I44be0362b31a91c724b7d5c8da7778bbdfc30990
Bill Yi [Sun, 8 Oct 2017 14:55:56 +0000 (14:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
1c5bd422fd -s ours
Change-Id: Ib77a48945fd9d889daa7461959749528f2633c3e
Bill Yi [Sun, 8 Oct 2017 14:55:56 +0000 (14:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
0ba66d8d9a -s ours
Change-Id: I0da1baa7455529b012b338fe465aa7057483fffd
TreeHugger Robot [Sun, 8 Oct 2017 14:52:12 +0000 (14:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 8 Oct 2017 14:50:51 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Sun, 8 Oct 2017 14:32:58 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours am:
581e056425 -s ours am:
79e5f61474 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sun, 8 Oct 2017 14:30:24 +0000 (14:30 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours am:
581e056425 -s ours
am:
5fcfe617eb -s ours
Change-Id: Ifb802d1770198c8ebfac24f4a7abeef9bad1e471
Bill Yi [Sun, 8 Oct 2017 14:30:22 +0000 (14:30 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours am:
581e056425 -s ours
am:
79e5f61474 -s ours
Change-Id: I0350ae33b9b85fbb9f6e5fdb779daab9bf92c478
Bill Yi [Sun, 8 Oct 2017 14:23:51 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours
am:
581e056425 -s ours
Change-Id: I2f31ca4fff4afedcabc66f2492c7252175c42733
Bill Yi [Sun, 8 Oct 2017 14:23:44 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours am:
09e6f1457b -s ours
am:
581e056425 -s ours
Change-Id: Ibda4a53003f1b10c6fb209a8af1cc6c95c8419d5
Bill Yi [Sun, 8 Oct 2017 14:16:28 +0000 (14:16 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours am:
d250d3aa34 -s ours
am:
09e6f1457b -s ours
Change-Id: I7010ae3bb92d9ec2adaa9eba4509ad2b713ecee7
Bill Yi [Sun, 8 Oct 2017 14:08:20 +0000 (14:08 +0000)]
Import translations. DO NOT MERGE am:
80d87da085 -s ours
am:
d250d3aa34 -s ours
Change-Id: I8b02ede43b1430713761f1ff89c7c864ef6ae4a7
Bill Yi [Sun, 8 Oct 2017 14:00:50 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
80d87da085 -s ours
Change-Id: I7b560ea83669c408725cf2e7d6e1a7c3d7eb191f
Bill Yi [Sun, 8 Oct 2017 13:22:24 +0000 (06:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ib770e076ec7294e42933896d1efb298912f1526c
Bill Yi [Sun, 8 Oct 2017 12:20:08 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4940cd7a3d5708a6e8091aad241320bf1eb15c8c
Bill Yi [Sun, 8 Oct 2017 12:07:09 +0000 (05:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I5d2a9d7f5d6f92f18b5433594c37cdecd9f8fe0c
Android Build Merger (Role) [Sun, 8 Oct 2017 07:23:09 +0000 (07:23 +0000)]
Merge "Import translations. DO NOT MERGE am:
87c4d55ccb -s ours am:
e3dff12f80 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sun, 8 Oct 2017 07:19:18 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE am:
87c4d55ccb -s ours
am:
e3dff12f80 -s ours
Change-Id: Ibaaa7c3a545ce4a97229f455bd6db5947740e271
Bill Yi [Sun, 8 Oct 2017 07:19:14 +0000 (07:19 +0000)]
Import translations. DO NOT MERGE am:
87c4d55ccb -s ours
am:
12d48a9b60 -s ours
Change-Id: I6a7668d596cb53a3596a50fc63de18baed51dba9
Bill Yi [Sun, 8 Oct 2017 07:11:31 +0000 (07:11 +0000)]
Import translations. DO NOT MERGE
am:
87c4d55ccb -s ours
Change-Id: I5884b9fbc3d2385c8aac8fe4612aec6a69ccdcb7
Bill Yi [Sun, 8 Oct 2017 07:08:47 +0000 (07:08 +0000)]
Import translations. DO NOT MERGE
am:
87c4d55ccb -s ours
Change-Id: I088ba3df3f4339070c1f26929815b3827403dd18
Bill Yi [Sun, 8 Oct 2017 07:08:18 +0000 (07:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1f22b044bb -s ours
Change-Id: I13d72cc05838f147a88fe62ecfcbfac1b80ee3b2
OSDN Git Service
