OSDN Git Service
Hugo Benichi [Tue, 15 Nov 2016 04:42:34 +0000 (13:42 +0900)]
ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.
This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.
Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.
With this change the test has been observed to pass with 100% success
rate over 50000 invocations.
Test: $ runtest frameworks-net
Bug:
32561414
Change-Id: Ib20f4656620b119456c2cb1c709a7fe8195fe44d
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.
With these timeouts the test succeeds 100% over 5000 iterations.
When using 150ms for registration timeout, running the test 5000 times
fails 2 times.
When using 30ms for onLost timeout, running the test 5000 times fails
1 times.
In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.
Test: $ runtest frameworks-net
Bug:
32561414
Change-Id: I7601b2f1f11f83914f885a74c8a376173eed186b
Fyodor Kupolov [Mon, 21 Nov 2016 23:57:56 +0000 (23:57 +0000)]
Merge "Presubmit test for PackageManager"
Ashutosh Joshi [Mon, 21 Nov 2016 23:39:49 +0000 (23:39 +0000)]
Merge "Cleanup ContexthubService implementation"
Etan Cohen [Mon, 21 Nov 2016 23:07:34 +0000 (23:07 +0000)]
Merge "[AWARE] Update API per review" am:
9e4f111e0f am:
ce7f932be7 am:
86cd994a15
am:
355e52215f
Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43
Jeff Sharkey [Mon, 21 Nov 2016 23:05:12 +0000 (23:05 +0000)]
Merge "StrictMode to detect untagged network traffic." am:
67fe28d925 am:
db5ed5beb1 am:
3391f3376e
am:
55727aaede
Change-Id: I272964fc9c2a9e350bacc0586dd6b2d4a23c5f51
Jeff Sharkey [Mon, 21 Nov 2016 23:03:55 +0000 (23:03 +0000)]
Merge "Stub Binder API." am:
4db1632b3a am:
313456c975 am:
c61a8e01a3
am:
8984897502 -s ours
Change-Id: Ib052b3afcf046786732d8084188d7fbec9805215
TreeHugger Robot [Mon, 21 Nov 2016 23:00:38 +0000 (23:00 +0000)]
Merge "Added 'oneway' flags on AIDL where appliable."
Android Build Merger (Role) [Mon, 21 Nov 2016 22:56:49 +0000 (22:56 +0000)]
Merge "Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am:
f9154e923b am:
de098d013c am:
f8ab89c514"
Adam Lesinski [Mon, 21 Nov 2016 22:56:14 +0000 (22:56 +0000)]
Merge "Move Resource creation out of ContextImpl constructor"
Nancy Zheng [Mon, 21 Nov 2016 22:55:55 +0000 (22:55 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am:
f9154e923b am:
de098d013c
am:
f8ab89c514
Change-Id: I7fa6629d5264ed7c96cced3355f900b9b2b99919
TreeHugger Robot [Mon, 21 Nov 2016 22:53:00 +0000 (22:53 +0000)]
Merge "Merge commit '
2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85"
Etan Cohen [Mon, 21 Nov 2016 22:12:00 +0000 (22:12 +0000)]
Merge "[AWARE] Update API per review" am:
9e4f111e0f am:
ce7f932be7
am:
86cd994a15
Change-Id: Iecf2458a037431114a8b9e0063524d2093fa13fc
Etan Cohen [Mon, 21 Nov 2016 21:58:55 +0000 (21:58 +0000)]
Merge "[AWARE] Update API per review" am:
9e4f111e0f
am:
ce7f932be7
Change-Id: I4702d65237c4a56b1f2cad2bf5e3505f1cd4ecfc
Jeff Sharkey [Mon, 21 Nov 2016 21:58:02 +0000 (21:58 +0000)]
Merge "StrictMode to detect untagged network traffic." am:
67fe28d925 am:
db5ed5beb1
am:
3391f3376e
Change-Id: I942f9c44a8c3b1abf39694816a34790df3e224ad
Etan Cohen [Mon, 21 Nov 2016 21:50:34 +0000 (21:50 +0000)]
Merge "[AWARE] Update API per review"
am:
9e4f111e0f
Change-Id: I69001477d02c612540ff74385400551293f7c600
Jeff Sharkey [Mon, 21 Nov 2016 21:48:31 +0000 (21:48 +0000)]
Merge "StrictMode to detect untagged network traffic." am:
67fe28d925
am:
db5ed5beb1
Change-Id: Id6ce5cfedab250f25c0eb8b0c49971e9e20cbeb2
Jeff Sharkey [Mon, 21 Nov 2016 21:43:58 +0000 (21:43 +0000)]
Merge "StrictMode to detect untagged network traffic."
am:
67fe28d925
Change-Id: I52cdce87d87ec503294e431c8f22e87235bdbf79
Etan Cohen [Mon, 21 Nov 2016 21:43:39 +0000 (21:43 +0000)]
Merge "[AWARE] Update API per review"
Steven Moreland [Mon, 21 Nov 2016 21:39:36 +0000 (21:39 +0000)]
Merge "LightService: log errors."
Treehugger Robot [Mon, 21 Nov 2016 21:33:15 +0000 (21:33 +0000)]
Merge "StrictMode to detect untagged network traffic."
Felipe Leme [Mon, 21 Nov 2016 19:10:22 +0000 (11:10 -0800)]
Added 'oneway' flags on AIDL where appliable.
Not only if fixes warning about outgoing transactions from system_server
not having the FLAG, but it fixes system crashes when the service
doesn't behave well (for example, if it does not call super.onCreate()
on onCreate().
BUG:
31001899
Test: manually built and ran it
Change-Id: I829ee501edb84bd02a60e8df92f9a0e0d2157887
Nancy Zheng [Mon, 21 Nov 2016 20:58:16 +0000 (12:58 -0800)]
Merge commit '
2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85
Test: compiled everything, CTS verifier passes
Change-Id: I96641860890e413342bcb6a3b24e87d6aeff0c99
Jeff Sharkey [Mon, 21 Nov 2016 20:31:28 +0000 (20:31 +0000)]
Merge "Stub Binder API." am:
4db1632b3a am:
313456c975
am:
c61a8e01a3
Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690
TreeHugger Robot [Mon, 21 Nov 2016 20:29:00 +0000 (20:29 +0000)]
Merge "No direct Uri grants from system."
Ashutosh Joshi [Fri, 4 Nov 2016 22:35:54 +0000 (15:35 -0700)]
Cleanup ContexthubService implementation
. Reorder include headers.
. Remove scary - but errorneous log.
Test: Presubmit passes.
Change-Id: I06c7b34bbf9ae59940c44eccc8545ea1c23faa15
Jeff Sharkey [Mon, 21 Nov 2016 20:26:22 +0000 (20:26 +0000)]
Merge "Stub Binder API." am:
4db1632b3a
am:
313456c975
Change-Id: Icc2db98a8ab325ca4bc7456abe5963c293a878cb
Jeff Sharkey [Mon, 21 Nov 2016 20:21:25 +0000 (20:21 +0000)]
Merge "Stub Binder API."
am:
4db1632b3a
Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2
Jeff Sharkey [Mon, 21 Nov 2016 20:10:28 +0000 (20:10 +0000)]
Merge "Stub Binder API."
Philip P. Moltmann [Mon, 21 Nov 2016 19:21:20 +0000 (19:21 +0000)]
Merge "Wait when other thread is binding to print spooler"
Jeff Sharkey [Mon, 21 Nov 2016 19:14:50 +0000 (12:14 -0700)]
StrictMode to detect untagged network traffic.
Define some constants for early use in AOSP code.
Test: builds, boots, all common traffic tagged
Bug:
30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
Jeff Sharkey [Mon, 21 Nov 2016 17:33:54 +0000 (10:33 -0700)]
No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions. Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.
Blocking at this level fixes an entire class of confused deputy
security issues.
Test: builds, normal intent resolution UI works
Bug:
33019296
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
Nancy Zheng [Mon, 21 Nov 2016 18:26:24 +0000 (18:26 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am:
f9154e923b
am:
de098d013c
Change-Id: Ia77e561eb2aabba4a29b81c09b55d251a3e6ece5
Nancy Zheng [Mon, 21 Nov 2016 18:25:12 +0000 (18:25 +0000)]
Fix createConfirmDeviceCredentialIntent for wear for CTS. am:
43f166dfb4
am:
a2193c0b76
Change-Id: I9f216231ff600972e3ddec195158fc2489693a1e
Etan Cohen [Wed, 16 Nov 2016 21:40:55 +0000 (13:40 -0800)]
[AWARE] Update API per review
- Move Handler to last position
- Peer ID changed from 'Object' -> opaque class
- Rename onMessageSent -> onMessageSendSucceeded
(cherry pick of commit
1fef08507aeb49bb2e4e7be4804a378ba2cf7770)
Bug:
31470256
Test: unit tests & integration (sl4a) tests pass
Change-Id: I5530d310e982ea16a63a5af1f704625fd24e436c
Nancy Zheng [Mon, 21 Nov 2016 18:19:53 +0000 (18:19 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
am:
f9154e923b
Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972
Nancy Zheng [Mon, 21 Nov 2016 18:19:48 +0000 (18:19 +0000)]
Fix createConfirmDeviceCredentialIntent for wear for CTS.
am:
43f166dfb4
Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
Nancy Zheng [Mon, 21 Nov 2016 18:13:03 +0000 (18:13 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
Jeff Sharkey [Mon, 21 Nov 2016 16:13:52 +0000 (09:13 -0700)]
Stub Binder API.
Provide a stub API for AOSP code to call.
Test: builds
Bug:
32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
Jeff Tinker [Mon, 21 Nov 2016 17:53:13 +0000 (17:53 +0000)]
Merge "Removing widevine classic"
Torne (Richard Coles) [Mon, 21 Nov 2016 17:18:55 +0000 (17:18 +0000)]
Merge "Precreate the classloader for the WebView." am:
566b1c80e4 am:
1feb782f01 am:
9565860b08
am:
7e17c6b0f1
Change-Id: Ie512327827e48319b3244a8d3041cb78538109d3
Torne (Richard Coles) [Mon, 21 Nov 2016 17:13:45 +0000 (17:13 +0000)]
Merge "Precreate the classloader for the WebView." am:
566b1c80e4 am:
1feb782f01
am:
9565860b08
Change-Id: I070288a127cbaa08f05b49f66e23ea0ec298040b
Torne (Richard Coles) [Mon, 21 Nov 2016 17:08:46 +0000 (17:08 +0000)]
Merge "Precreate the classloader for the WebView." am:
566b1c80e4
am:
1feb782f01
Change-Id: Iec0bf848e4c25afc6a6b9ee83339a03f314adee9
Torne (Richard Coles) [Mon, 21 Nov 2016 17:04:22 +0000 (17:04 +0000)]
Merge "Precreate the classloader for the WebView."
am:
566b1c80e4
Change-Id: Ic79079748dae515cb8d89ef99148755ac65f1d47
Treehugger Robot [Mon, 21 Nov 2016 16:54:52 +0000 (16:54 +0000)]
Merge "Precreate the classloader for the WebView."
Jeff Sharkey [Mon, 21 Nov 2016 16:19:39 +0000 (16:19 +0000)]
Merge "Check provider access for content changes."
Ian Pedowitz [Mon, 21 Nov 2016 15:13:27 +0000 (15:13 +0000)]
Merge "Revert "Lists returned from OS aren't mutable.""
Ian Pedowitz [Mon, 21 Nov 2016 15:09:54 +0000 (15:09 +0000)]
Revert "Lists returned from OS aren't mutable."
This reverts commit
97449fa389dbc1ab872d63fde001bae7a659991b.
Bug:
33034458
Bug:
33032977
Bug:
27856974
Change-Id: If913e587ce4a48b9ed1c7c0a811bc39ce4e31d3c
Torne (Richard Coles) [Mon, 10 Oct 2016 14:11:36 +0000 (15:11 +0100)]
Precreate the classloader for the WebView.
We want to create the classloader for the WebView in advance in the
zygote so that it can preload Java and native code for its children, but
the zygote can't talk to the package manager (so doesn't have a
PackageInfo for the APK) and also doesn't have an ActivityThread, so
constructing a LoadedApk is difficult.
Instead, we use the fact that ApplicationLoaders contains a
process-global cache of classloaders for APKs, and prepopulate a cache
entry without constructing a LoadedApk. This requires making
ApplicationLoaders public. To calculate the correct library paths from
the information the zygote has, we reuse the logic in LoadedApk (which
is already public, and just needs a small change to allow a null
ActivityThread when checking for instrumentation).
The other parameters for classloader creation (target SDK, bundled app,
etc) are hardcoded to usable values for the WebView's case. WebView
never needs to use any system libraries that aren't public so claiming
it's not bundled is fine even when that isn't actually true, and WebView
will always target the current platform API level.
Once the classloader is created, look up the factory class and call
preloadInZygote on it to give it a chance to preload the native library
and do other shared initialisation.
Bug:
21643067
Test: enable multiprocess WebView, examine librank output to see sharing
Change-Id: I696ead637e3f7382bcc58cfaf61eac5921862015
Tobias Thierer [Mon, 21 Nov 2016 14:33:46 +0000 (14:33 +0000)]
Merge "API: Rename Collections.singleton*() type arg E -> T"
Tobias Thierer [Fri, 18 Nov 2016 20:56:51 +0000 (20:56 +0000)]
API: Rename Collections.singleton*() type arg E -> T
This rename is part of the update of Collections.java to OpenJDK8u60.
This is compatible change because generic type argument names affect
neither compile time nor runtime compatibility.
The build system (incorrectly) flags this as a change to a released
API. Removing or changing released public APIs is infeasible on AOSP.
Therefore this change will remain restricted to internal branches
until the API is released.
Bug:
31902309
Test: make
Change-Id: I54bc3d6321429ff18c6057332b469286e8b1d42d
TreeHugger Robot [Mon, 21 Nov 2016 07:26:03 +0000 (07:26 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 21 Nov 2016 05:49:14 +0000 (05:49 +0000)]
Merge "Update the documentation related to VD / AVD"
Bill Yi [Mon, 21 Nov 2016 02:36:47 +0000 (02:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
b9762351a3 -s ours am:
00544de5d0 -s ours
am:
059022bc1b -s ours
Change-Id: Ie0f0b1e584527475c30aff1b45f957789b0cac14
Bill Yi [Mon, 21 Nov 2016 02:35:46 +0000 (02:35 +0000)]
Import translations. DO NOT MERGE am:
2bfcd92a56 -s ours am:
c530f91d8d -s ours
am:
b4013c83be -s ours
Change-Id: Ib21972c9ae333143ce12e33e4f7175c799bcb69d
Bill Yi [Mon, 21 Nov 2016 02:34:40 +0000 (02:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
1ad0a421a6 -s ours am:
c8d1cba0fa -s ours
am:
28345564b1 -s ours
Change-Id: I66f0140a84d555679c1f61df787dffc3128bb49f
Bill Yi [Mon, 21 Nov 2016 02:33:31 +0000 (02:33 +0000)]
Import translations. DO NOT MERGE am:
e65b214f31 -s ours am:
584f7438ad -s ours
am:
31174c35f0 -s ours
Change-Id: I079e4f35c405cb614403de53284b4abfd447fd82
Bill Yi [Mon, 21 Nov 2016 02:32:27 +0000 (02:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5770cc3c21 -s ours am:
b712d61315 -s ours
am:
641a470843 -s ours
Change-Id: I7cf89e650005871658ae2247374ac95d62247206
Bill Yi [Mon, 21 Nov 2016 02:31:15 +0000 (02:31 +0000)]
Import translations. DO NOT MERGE am:
de5a72d802 -s ours am:
1959d2182c -s ours
am:
8fb0ffb4d0 -s ours
Change-Id: I45f39dd9afc3ade0431550c20e6fa1efe907b8ad
Bill Yi [Mon, 21 Nov 2016 02:28:03 +0000 (02:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
dc92c70106 -s ours am:
fb8a4d17c2 -s ours
am:
e083c8ea88 -s ours
Change-Id: I9952e7ec17edfe7746c99dd5aa5e96c54e4ca100
Bill Yi [Mon, 21 Nov 2016 02:26:57 +0000 (02:26 +0000)]
Import translations. DO NOT MERGE am:
2a2e8ce297 -s ours am:
3ea5862bb1 -s ours
am:
e71efd830b -s ours
Change-Id: I78aff8732c8a3e9e581f08464f706441a4446c02
Bill Yi [Mon, 21 Nov 2016 02:25:55 +0000 (02:25 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
81abcfea7b -s ours am:
bb7bad413a -s ours
am:
44ceb0eef5 -s ours
Change-Id: I287d63ac13ab680e2c103262caac3ecf5b8435fe
Bill Yi [Mon, 21 Nov 2016 02:24:48 +0000 (02:24 +0000)]
Import translations. DO NOT MERGE am:
521b3d5259 -s ours am:
db8719a721 -s ours
am:
d19aba43cd -s ours
Change-Id: I8a0451022b919ce20e19f1076e5759522c211596
Bill Yi [Mon, 21 Nov 2016 02:23:42 +0000 (02:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f94b944f80 -s ours am:
56cfda2ed4 -s ours
am:
b8953810e8 -s ours
Change-Id: I4da36c04729ebc2bdb3f9d18f473537adbd4828f
Bill Yi [Mon, 21 Nov 2016 02:22:39 +0000 (02:22 +0000)]
Import translations. DO NOT MERGE am:
149b6ede65 -s ours am:
f4561d90dc -s ours
am:
c2574b9ba6 -s ours
Change-Id: I5846a654d802435a00cdb0e8b034ff2111fbb8be
Bill Yi [Mon, 21 Nov 2016 02:20:24 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
b9762351a3 -s ours
am:
00544de5d0 -s ours
Change-Id: I6f8aabe8b93dd3a81f615bdc33cd7ce8997a65e8
Bill Yi [Mon, 21 Nov 2016 02:19:20 +0000 (02:19 +0000)]
Import translations. DO NOT MERGE am:
2bfcd92a56 -s ours
am:
c530f91d8d -s ours
Change-Id: I10126d3aa1d2c315445a22059182d95c03f71520
Bill Yi [Mon, 21 Nov 2016 02:18:15 +0000 (02:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
1ad0a421a6 -s ours
am:
c8d1cba0fa -s ours
Change-Id: I485a1f07041a16db18feec8cc83b282363bec568
Bill Yi [Mon, 21 Nov 2016 02:17:10 +0000 (02:17 +0000)]
Import translations. DO NOT MERGE am:
e65b214f31 -s ours
am:
584f7438ad -s ours
Change-Id: I420d94ba079fa629dc1427b868a2633d98fd296a
Bill Yi [Mon, 21 Nov 2016 02:16:11 +0000 (02:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5770cc3c21 -s ours
am:
b712d61315 -s ours
Change-Id: Ia30f6cfcc7f7aa54ce3dab4e0f6cdbc75f75204f
Bill Yi [Mon, 21 Nov 2016 02:15:10 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
de5a72d802 -s ours
am:
1959d2182c -s ours
Change-Id: Ic59f23548fff2936730508652c2175859871cb43
Bill Yi [Mon, 21 Nov 2016 02:15:01 +0000 (02:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
577b77a87a -s ours am:
875ecf8dcf -s ours
am:
4286a5b80a -s ours
Change-Id: I348dd1a2a98f005b4c761e46a2eb1ac36c8104da
Bill Yi [Mon, 21 Nov 2016 02:14:05 +0000 (02:14 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
dc92c70106 -s ours
am:
fb8a4d17c2 -s ours
Change-Id: Iad52ae446ff8eb6a628ef29a7bd2013e7f060994
Bill Yi [Mon, 21 Nov 2016 02:13:57 +0000 (02:13 +0000)]
Import translations. DO NOT MERGE am:
a54b679f2a -s ours am:
1d4aff76fa -s ours
am:
23e3ac4cb5 -s ours
Change-Id: Ib6aee525905d5b38687214e2d9a386a246cba7b5
Bill Yi [Mon, 21 Nov 2016 02:13:00 +0000 (02:13 +0000)]
Import translations. DO NOT MERGE am:
2a2e8ce297 -s ours
am:
3ea5862bb1 -s ours
Change-Id: Ic7e86d0fc29124ff060e45a0e37e8f6b12b6eb64
Bill Yi [Mon, 21 Nov 2016 02:12:52 +0000 (02:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a4c8fe82e8 -s ours am:
bbdb6e79ba -s ours
am:
bd36ee3b77 -s ours
Change-Id: If42d45c864baf815fd23507cc74390d9e2c4be1d
Bill Yi [Mon, 21 Nov 2016 02:11:59 +0000 (02:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
81abcfea7b -s ours
am:
bb7bad413a -s ours
Change-Id: I82a6ab8827a3b8416d797493f07f0b036af8d4ea
Bill Yi [Mon, 21 Nov 2016 02:11:49 +0000 (02:11 +0000)]
Import translations. DO NOT MERGE am:
484b776b78 -s ours am:
80cfaad5e4 -s ours
am:
175d2b2848 -s ours
Change-Id: I9de82526de99f4504e3348934b7b30f578dc3d72
Bill Yi [Mon, 21 Nov 2016 02:10:54 +0000 (02:10 +0000)]
Import translations. DO NOT MERGE am:
521b3d5259 -s ours
am:
db8719a721 -s ours
Change-Id: I1391a2c743347808cb0a215fb40eeeb0c7267b52
Bill Yi [Mon, 21 Nov 2016 02:10:41 +0000 (02:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
9fb559183f -s ours am:
7edeb95b59 -s ours
am:
b521fe6756 -s ours
Change-Id: I27b995b52d91d527824139156e0afef4275e4bbe
Bill Yi [Mon, 21 Nov 2016 02:09:48 +0000 (02:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f94b944f80 -s ours
am:
56cfda2ed4 -s ours
Change-Id: Ia1590d2e57d40b54fc799ba63a6e488b131dcc2f
Bill Yi [Mon, 21 Nov 2016 02:09:37 +0000 (02:09 +0000)]
Import translations. DO NOT MERGE am:
44fc3e0900 -s ours am:
1a9f44a604 -s ours
am:
ffcdd21814 -s ours
Change-Id: I118efb46fb9ad277e893e051f3110e90ee534b1d
Bill Yi [Mon, 21 Nov 2016 02:08:42 +0000 (02:08 +0000)]
Import translations. DO NOT MERGE am:
149b6ede65 -s ours
am:
f4561d90dc -s ours
Change-Id: Ie0f3bd3f011183c33640ad58dd094d54bbb0a2ac
Bill Yi [Mon, 21 Nov 2016 02:06:16 +0000 (02:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c3ba50cc48 -s ours am:
f9bdf27124 -s ours
am:
e01dadb8bf -s ours
Change-Id: Ifa08f376895bd9c238aceb7a2c0a48447ef1bd2e
Bill Yi [Mon, 21 Nov 2016 02:05:11 +0000 (02:05 +0000)]
Import translations. DO NOT MERGE am:
3b4e128814 -s ours am:
639a3c78bd -s ours
am:
baa88a8a40 -s ours
Change-Id: I79c230cdef38647e73d525e9680ddab70aa98efb
Bill Yi [Mon, 21 Nov 2016 02:04:09 +0000 (02:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
0b555bb27d -s ours am:
9a82f273a8 -s ours
am:
a1a953be7e -s ours
Change-Id: I66cebcb5399ede8fc713c9107d34f23d4b69c887
Bill Yi [Mon, 21 Nov 2016 02:03:13 +0000 (02:03 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
577b77a87a -s ours
am:
875ecf8dcf -s ours
Change-Id: I3369de360f2406cf4d1091740a9c108757ebe85c
Bill Yi [Mon, 21 Nov 2016 02:03:11 +0000 (02:03 +0000)]
Import translations. DO NOT MERGE am:
5e7d7e48f0 -s ours am:
4b31a0eff4 -s ours
am:
3956a928a7 -s ours
Change-Id: I0b243454c1e2f899f0baac6473b43038bcbc1545
Bill Yi [Mon, 21 Nov 2016 02:02:13 +0000 (02:02 +0000)]
Import translations. DO NOT MERGE am:
a54b679f2a -s ours
am:
1d4aff76fa -s ours
Change-Id: I4da76a2efef8385e4c3bdd70374cc4f07c8f68b8
Bill Yi [Mon, 21 Nov 2016 02:02:08 +0000 (02:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
e450219549 -s ours am:
d66188a6c6 -s ours
am:
fdb0b75372 -s ours
Change-Id: Ia4fec39d43193930094a9b9c1b91bf54983460aa
Bill Yi [Mon, 21 Nov 2016 02:01:13 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a4c8fe82e8 -s ours
am:
bbdb6e79ba -s ours
Change-Id: Id7310c450c4bf6174ed43f6ce88d86bf5c2720f1
Bill Yi [Mon, 21 Nov 2016 02:01:06 +0000 (02:01 +0000)]
Import translations. DO NOT MERGE am:
a45b9aa91a -s ours am:
8abe6b3389 -s ours
am:
7ea0d0c7b2 -s ours
Change-Id: I60f6f719e15f883c311e56c14a38ef7e1c317820
Bill Yi [Mon, 21 Nov 2016 02:00:17 +0000 (02:00 +0000)]
Import translations. DO NOT MERGE am:
484b776b78 -s ours
am:
80cfaad5e4 -s ours
Change-Id: I8479908cb1bcf1d56913ffc55b2ae01c655c3e20
Bill Yi [Mon, 21 Nov 2016 01:59:21 +0000 (01:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
b9762351a3 -s ours
Change-Id: I0ca58c850947f5db573ad8568d8e2d74cc03aa13
Bill Yi [Mon, 21 Nov 2016 01:59:19 +0000 (01:59 +0000)]
Import translations. DO NOT MERGE
am:
2bfcd92a56 -s ours
Change-Id: I2d08c0a99eafd4e22c5a136c719b9e03b64a738b
Bill Yi [Mon, 21 Nov 2016 01:59:15 +0000 (01:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
9fb559183f -s ours
am:
7edeb95b59 -s ours
Change-Id: Iba0a82ad3757259bcaf4a211f656cb7c09da39d2
Bill Yi [Mon, 21 Nov 2016 01:58:19 +0000 (01:58 +0000)]
Import translations. DO NOT MERGE am:
44fc3e0900 -s ours
am:
1a9f44a604 -s ours
Change-Id: Ica17197de7f4e5166f2f483d39be6185e3d991a5
Bill Yi [Mon, 21 Nov 2016 01:57:55 +0000 (01:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
1ad0a421a6 -s ours
Change-Id: I2ecaab2b1546264cff2785bc5cfca2afcd666dd6
Bill Yi [Mon, 21 Nov 2016 01:57:53 +0000 (01:57 +0000)]
Import translations. DO NOT MERGE
am:
e65b214f31 -s ours
Change-Id: I53c1cb64b9b18b9142d0cdb59c996e2a787eaf32
Bill Yi [Mon, 21 Nov 2016 01:57:13 +0000 (01:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c3ba50cc48 -s ours
am:
f9bdf27124 -s ours
Change-Id: I1face0bfe1f87a4f8467784b082cf47a01c9d1b6
OSDN Git Service
