OSDN Git Service
Sudheer Shanka [Fri, 28 Oct 2016 00:42:25 +0000 (17:42 -0700)]
Remove ApplicationThreadNative from preloaded/compiled-classes.
And add IApplicationThread$Stub and IApplicationThread$Stub$Proxy.
Bug:
30977067
Test: N/A
Change-Id: I86f9517ac25bf68320e94524c617b101e5bbb80c
Fyodor Kupolov [Thu, 27 Oct 2016 18:21:47 +0000 (18:21 +0000)]
Merge "Use app context to avoid memory leaks"
TreeHugger Robot [Thu, 27 Oct 2016 17:54:59 +0000 (17:54 +0000)]
Merge "Fix hide fragment transition"
Leonard Mosescu [Thu, 27 Oct 2016 17:50:33 +0000 (17:50 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master am:
258790a2ea am:
df87eb4adc
am:
c41f617dec
Change-Id: I09f88b45fd4deea370246dc74465a3db702d8078
Leonard Mosescu [Thu, 27 Oct 2016 17:49:32 +0000 (17:49 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours am:
d73688521c am:
8d0cdfb291
am:
b9b149d9dd
Change-Id: I7335d4314f32a709dfc055964d3a9f3869bd8b7e
Michal Karpinski [Thu, 27 Oct 2016 17:48:27 +0000 (17:48 +0000)]
Extending DNS event reporting am:
6e54239e50 am:
8c32fd2d33
am:
9351835591
Change-Id: Id482e6a300de49cc1d37ec6e38b9c651ec671f3e
TreeHugger Robot [Thu, 27 Oct 2016 17:45:11 +0000 (17:45 +0000)]
Merge "Move SkMovie into frameworks/base"
Leonard Mosescu [Thu, 27 Oct 2016 17:39:59 +0000 (17:39 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master am:
258790a2ea
am:
df87eb4adc
Change-Id: Iafeb38ea7de7b233914e2abc8a251061921bf62a
Leonard Mosescu [Thu, 27 Oct 2016 17:39:07 +0000 (17:39 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours am:
d73688521c
am:
8d0cdfb291
Change-Id: I18ce0a2d49ab95c89e8318d009112f3c126b58ad
Michal Karpinski [Thu, 27 Oct 2016 17:38:18 +0000 (17:38 +0000)]
Extending DNS event reporting am:
6e54239e50
am:
8c32fd2d33
Change-Id: Ia12eb058152589c62e541f6198880f7ce421023c
Leonard Mosescu [Thu, 27 Oct 2016 17:29:24 +0000 (17:29 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
am:
258790a2ea
Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
Leonard Mosescu [Thu, 27 Oct 2016 17:29:19 +0000 (17:29 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours
am:
d73688521c
Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
Michal Karpinski [Thu, 27 Oct 2016 17:28:15 +0000 (17:28 +0000)]
Extending DNS event reporting
am:
6e54239e50
Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
Android Build Merger (Role) [Thu, 27 Oct 2016 17:24:53 +0000 (17:24 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
Leonard Mosescu [Thu, 27 Oct 2016 17:24:17 +0000 (17:24 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am:
bd2688f4c3 -s ours
Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
Sunny Goyal [Thu, 27 Oct 2016 17:14:43 +0000 (17:14 +0000)]
Merge "Adding support for async view loading in RemoteViewsAdapter"
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
Leonard Mosescu [Fri, 7 Oct 2016 00:32:05 +0000 (17:32 -0700)]
Adding "attach-agent" to ActivityManagerShellCommand
This new command is used to attach runtime agents to a running application:
attach-agent <PROCESS> <FILE>
Attach an agent to the specified <PROCESS>,
which may be either a process name or a PID.
Test: m test-art-host, manual testing:
. invalid syntax, missing arguments
. invalid syntax, extra arguments
. invalid numeric PID
. invalid process name
. valid process, not debuggable
. valid process, missing agent
. valid process, valid agent
Bug:
31682382
Change-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Glen Kuhne [Thu, 27 Oct 2016 16:28:20 +0000 (16:28 +0000)]
Merge "Move wifi.proto to shared service .jar"
Glen Kuhne [Thu, 27 Oct 2016 16:27:24 +0000 (16:27 +0000)]
Merge "Move ipconnectivity.proto to services-proto.jar"
Philip P. Moltmann [Thu, 27 Oct 2016 16:15:11 +0000 (16:15 +0000)]
Merge "Add UsbDeviceConnection.requestWait with a timeout"
George Mount [Thu, 27 Oct 2016 15:12:36 +0000 (08:12 -0700)]
Fix hide fragment transition
Bug
30699392
During optimized hide operations with fragment transitions, the
hidden fragment View should not be GONE, but instead be visible
and the exiting views should be made INVISIBLE. After the
transition completes, the fragment's view should be GONE.
Test: I189fb22883637888516fb04940dbb288cb9a49d2
Change-Id: I3a80fdaa198ed04916df02b1d2ca069e6992f88f
Lorenzo Colitti [Thu, 27 Oct 2016 15:33:22 +0000 (15:33 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2 am:
853427a30a am:
57ee5d7e9c
am:
6f605a4e0f
Change-Id: I8013cd6a7abe6f1c40c183c3857972dec0679b63
Michal Karpinski [Thu, 27 Oct 2016 15:29:01 +0000 (15:29 +0000)]
Add connect event reporting am:
265494a0f8 am:
17be4d6c85 am:
8fba923d2a
am:
c1b04a8b6a
Change-Id: I37be845fee3b9a46969b749ca3bca3d6f9425e2c
Michal Karpinski [Thu, 27 Oct 2016 15:27:36 +0000 (15:27 +0000)]
Extending DNS event reporting am:
f82d1596ce am:
3156b53fbe am:
c1ca63e8cb
am:
6b5c634752
Change-Id: Id7b964d1d0ec70957b79eac98cda24b145eea79e
Eric Laurent [Thu, 27 Oct 2016 15:23:04 +0000 (15:23 +0000)]
Merge "radio: fix 64 bit process compatibility"
TreeHugger Robot [Thu, 27 Oct 2016 14:13:15 +0000 (14:13 +0000)]
Merge "Implement getTransparentRegion() using SkLatticeIter"
Leon Scroggins III [Wed, 26 Oct 2016 13:45:45 +0000 (09:45 -0400)]
Move SkMovie into frameworks/base
Test: Refactor. Relying on existing tests of android.graphics.Movie.
Skia is no longer working on SkMovie, so move it to the only place that
it is used.
Files moved from Skia (all the added files) are unchanged except for
renames (SkMovie -> Movie; SkGIFMovie -> GIFMovie).
Change-Id: I5f12d5def5fe825dda637f8aecf84e73e2dae9ca
Lorenzo Colitti [Thu, 27 Oct 2016 13:38:34 +0000 (13:38 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2 am:
853427a30a
am:
57ee5d7e9c
Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e
Michal Karpinski [Thu, 27 Oct 2016 13:31:09 +0000 (13:31 +0000)]
Add connect event reporting am:
265494a0f8 am:
17be4d6c85
am:
8fba923d2a
Change-Id: I20bca735eba409fe17c8c1bbec1bce20a1ca0723
Lorenzo Colitti [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2
am:
853427a30a
Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
Michal Karpinski [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Extending DNS event reporting am:
f82d1596ce am:
3156b53fbe
am:
c1ca63e8cb
Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538
Michal Karpinski [Thu, 27 Oct 2016 13:21:37 +0000 (13:21 +0000)]
Add connect event reporting am:
265494a0f8
am:
17be4d6c85
Change-Id: I042fdb187af2de08374864867dbd75d8c92c56c9
Lorenzo Colitti [Thu, 27 Oct 2016 13:20:34 +0000 (13:20 +0000)]
Merge changes from topic 'netd_aosp'
am:
d19524f4f2
Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
Michal Karpinski [Thu, 27 Oct 2016 13:20:31 +0000 (13:20 +0000)]
Extending DNS event reporting am:
f82d1596ce
am:
3156b53fbe
Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
Michal Karpinski [Thu, 27 Oct 2016 13:13:56 +0000 (13:13 +0000)]
Add connect event reporting
am:
265494a0f8
Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am:
f82d1596ce
Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
Lorenzo Colitti [Thu, 27 Oct 2016 13:05:25 +0000 (13:05 +0000)]
Merge changes from topic 'netd_aosp'
* changes:
Add connect event reporting
Extending DNS event reporting
Matt Sarett [Tue, 25 Oct 2016 22:36:39 +0000 (18:36 -0400)]
Implement getTransparentRegion() using SkLatticeIter
This allows us to delete utils/NinePatchImpl.cpp and
utils/NinePatch.h
Test: Passed cts tests - DrawableTest, NinePatchTest,
NinePatchDrawableTest.
Change-Id: I6b5d09fa3479e758d8b931fa0e977c25f4435a7c
Diego Perez [Thu, 27 Oct 2016 10:15:39 +0000 (10:15 +0000)]
Merge "Remove use of refSkPixelRef"
Michal Karpinski [Wed, 28 Sep 2016 15:06:16 +0000 (16:06 +0100)]
Add connect event reporting
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future CTS
Bug:
29748723
(cherry picked from commit
965894eeb90c13255b5559b925d13fd22528f8cb)
Change-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.
Test: for now just the benchmarking, in the future unit and CTS
(cherry picked from commit
14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
Bug:
29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
Andrii Kulian [Thu, 27 Oct 2016 07:52:03 +0000 (07:52 +0000)]
Merge "Refactor stack removal methods"
Bill Yi [Thu, 27 Oct 2016 05:34:10 +0000 (05:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
43905cc9ac -s ours am:
3b2c3fe5ef -s ours am:
ea109fa2c7 -s ours
am:
3882273957 -s ours
Change-Id: Ifbad3f8490583242e7d80397b5f3b975e88d0830
Bill Yi [Thu, 27 Oct 2016 05:33:20 +0000 (05:33 +0000)]
Import translations. DO NOT MERGE am:
1377e2b985 -s ours am:
df305805c6 -s ours am:
51521f2e18 -s ours
am:
973a754296 -s ours
Change-Id: Ief6e6da91a2a7745eb8092c211fdb7ba82b836ba
Bill Yi [Thu, 27 Oct 2016 05:32:22 +0000 (05:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ad45d97c45 -s ours am:
d557ea9388 -s ours am:
0141333d25 -s ours
am:
63b7b89c96 -s ours
Change-Id: I33df334e2fa701cc015e8125c5e2500df826936f
Bill Yi [Thu, 27 Oct 2016 05:31:22 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours am:
6296c78ee4 -s ours am:
044be18ae4 -s ours
am:
901527ccef -s ours
Change-Id: I8db225d899925c52922f41825183b043f866fc6f
Bill Yi [Thu, 27 Oct 2016 05:30:32 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41912188e5 -s ours am:
f0a5ebb129 -s ours
am:
1ef4b78ca3 -s ours
Change-Id: Idc0912b1f378417d5823f97701f8496755db6377
Bill Yi [Thu, 27 Oct 2016 05:29:41 +0000 (05:29 +0000)]
Import translations. DO NOT MERGE am:
bff09ae3c8 -s ours am:
305004ba4d -s ours
am:
7abc47da41 -s ours
Change-Id: Ib4a3c8cc185c893f478ad8858fc7b5c61eb6c084
Bill Yi [Thu, 27 Oct 2016 05:28:52 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c2effd95e2 -s ours am:
6b8d9b2337 -s ours
am:
269392893b -s ours
Change-Id: I7b79f8e1d1052b53e3cb605f330a15c105f52a35
Bill Yi [Thu, 27 Oct 2016 05:28:04 +0000 (05:28 +0000)]
Import translations. DO NOT MERGE am:
644a22437f -s ours am:
316c6df269 -s ours
am:
ce37c7b14f -s ours
Change-Id: Ie696fc1f7d83b172e5859e9f82498882d5460d21
Bill Yi [Thu, 27 Oct 2016 05:25:03 +0000 (05:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
43905cc9ac -s ours am:
3b2c3fe5ef -s ours
am:
ea109fa2c7 -s ours
Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132
Android Build Merger (Role) [Thu, 27 Oct 2016 05:24:48 +0000 (05:24 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev am:
d37981be5a -s ours am:
64d92dc381 -s ours"
Bill Yi [Thu, 27 Oct 2016 05:24:13 +0000 (05:24 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev am:
d37981be5a -s ours
am:
64d92dc381 -s ours
Change-Id: Ib1ddc2a0926bea50e29b4e3ef7cb098a5e94823e
Bill Yi [Thu, 27 Oct 2016 05:24:09 +0000 (05:24 +0000)]
Import translations. DO NOT MERGE am:
1377e2b985 -s ours am:
df305805c6 -s ours
am:
51521f2e18 -s ours
Change-Id: I4e07de2591fe8fbc4c8512fb47807aa434ab9a5a
Android Build Merger (Role) [Thu, 27 Oct 2016 05:23:56 +0000 (05:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours am:
38948cf86d -s ours am:
d7546218b5 -s ours"
Bill Yi [Thu, 27 Oct 2016 05:23:23 +0000 (05:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours am:
38948cf86d -s ours
am:
d7546218b5 -s ours
Change-Id: Ib981dac3521a620263725bd684bb9ea618b0b966
Bill Yi [Thu, 27 Oct 2016 05:23:21 +0000 (05:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ad45d97c45 -s ours am:
d557ea9388 -s ours
am:
0141333d25 -s ours
Change-Id: I12544624bd86847af3528ec3f932d1442fee8f59
Android Build Merger (Role) [Thu, 27 Oct 2016 05:23:07 +0000 (05:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
50f02f9d0a -s ours am:
521faf362a -s ours"
Bill Yi [Thu, 27 Oct 2016 05:22:34 +0000 (05:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
50f02f9d0a -s ours
am:
521faf362a -s ours
Change-Id: I31e63888d11657f0ead8732e6af22282d66a23b5
Bill Yi [Thu, 27 Oct 2016 05:22:26 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours am:
6296c78ee4 -s ours
am:
044be18ae4 -s ours
Change-Id: I20f54a15d996b4fb1c786b1aabe8e090c5a558ca
Android Build Merger (Role) [Thu, 27 Oct 2016 05:22:18 +0000 (05:22 +0000)]
Merge "Import translations. DO NOT MERGE am:
6e3055ee37 -s ours am:
0c78c9e049 -s ours"
Bill Yi [Thu, 27 Oct 2016 05:21:41 +0000 (05:21 +0000)]
Import translations. DO NOT MERGE am:
6e3055ee37 -s ours
am:
0c78c9e049 -s ours
Change-Id: Ide1881569e565b54662c66ee44b90e6d215d5042
Bill Yi [Thu, 27 Oct 2016 05:21:38 +0000 (05:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41912188e5 -s ours
am:
f0a5ebb129 -s ours
Change-Id: Ia8d103f423f72e3a32005f3f2c424ae2adac0ab3
Hugo Benichi [Thu, 27 Oct 2016 05:21:30 +0000 (05:21 +0000)]
Merge "ConnectivityServiceTest: mark flaky test as such"
Bill Yi [Thu, 27 Oct 2016 05:20:49 +0000 (05:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
000e2093d2 -s ours
am:
c7b922bb83 -s ours
Change-Id: Ibe53e83a20755f14dc0f79b7aeae3686ab1c343f
Bill Yi [Thu, 27 Oct 2016 05:20:47 +0000 (05:20 +0000)]
Import translations. DO NOT MERGE am:
bff09ae3c8 -s ours
am:
305004ba4d -s ours
Change-Id: I43d0bd29cfb6ed5d332ee417c5b4e79d04b9b1b0
Bill Yi [Thu, 27 Oct 2016 05:19:57 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
fc0224f880 -s ours
am:
5eb8d7f3f3 -s ours
Change-Id: I3435809c9e16599e99d62ec7a40aa16b0254c8d0
Bill Yi [Thu, 27 Oct 2016 05:19:56 +0000 (05:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c2effd95e2 -s ours
am:
6b8d9b2337 -s ours
Change-Id: I8311d8bc6ceee0de7935e8aaaa4c7dd091d2662f
Bill Yi [Thu, 27 Oct 2016 05:19:07 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours am:
18608133d8 -s ours am:
1653bfafc4 -s ours
am:
4cb84a4c59 -s ours
Change-Id: I9c64e2069eff1f3f24bcc5d1d29b5f767ab71e5e
Bill Yi [Thu, 27 Oct 2016 05:19:05 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am:
644a22437f -s ours
am:
316c6df269 -s ours
Change-Id: Ie9824ce9a2f24cc54b674209c82b717699a3cd2c
Bill Yi [Thu, 27 Oct 2016 05:13:33 +0000 (05:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
43905cc9ac -s ours
am:
3b2c3fe5ef -s ours
Change-Id: I4cbde56de0e86e7dc1f97595a60a2d38de078bc7
Bill Yi [Thu, 27 Oct 2016 05:12:51 +0000 (05:12 +0000)]
Import translations. DO NOT MERGE am:
1377e2b985 -s ours
am:
df305805c6 -s ours
Change-Id: Id238b877c3013be65641fe1e1d6937b6c1e4bdbf
Bill Yi [Thu, 27 Oct 2016 05:12:04 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ad45d97c45 -s ours
am:
d557ea9388 -s ours
Change-Id: Id6e530980e21ac4d2cb63ca3623bc28457ae8c2d
Bill Yi [Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev
am:
d37981be5a -s ours
Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035
Bill Yi [Thu, 27 Oct 2016 05:11:16 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours
am:
38948cf86d -s ours
Change-Id: Ie362bb496f0f7262399434248f23bf1bbcbea991
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
50f02f9d0a -s ours
Change-Id: Ia71f1c93cb5abcc59867fc6318eac41536bf8ea0
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours
am:
6296c78ee4 -s ours
Change-Id: I9396a152c47e270c7660f46dca006468d26306c6
Bill Yi [Thu, 27 Oct 2016 05:09:14 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE
am:
6e3055ee37 -s ours
Change-Id: Ieb71085d233a47c000241368d435a3f8df985e03
Bill Yi [Thu, 27 Oct 2016 05:08:10 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
41912188e5 -s ours
Change-Id: Iadb23aebd270d96d6597e654b6ba5f417b023e96
Bill Yi [Thu, 27 Oct 2016 05:08:08 +0000 (05:08 +0000)]
Import translations. DO NOT MERGE
am:
bff09ae3c8 -s ours
Change-Id: Ie89040ae5c700d5ee12f371ff5aa412b7fec0340
Bill Yi [Thu, 27 Oct 2016 05:08:01 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
000e2093d2 -s ours
Change-Id: I9dc4dc4f9af82ecb8cd20acd3eb13021d25375dd
Bill Yi [Thu, 27 Oct 2016 05:07:56 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE
am:
fc0224f880 -s ours
Change-Id: Ia6ca469ec75244202c5cf49605e05ab364bd0274
Bill Yi [Thu, 27 Oct 2016 05:07:03 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours am:
18608133d8 -s ours
am:
1653bfafc4 -s ours
Change-Id: I4793a3d04fc08897fdab2f11f4fa194076219b49
Bill Yi [Thu, 27 Oct 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c2effd95e2 -s ours
Change-Id: I982ed94bacbe316d1633fa30bb8b6b315ebf2354
Bill Yi [Thu, 27 Oct 2016 05:06:59 +0000 (05:06 +0000)]
Import translations. DO NOT MERGE
am:
644a22437f -s ours
Change-Id: I8204369580e5bb38a72570b175c066e903c2e9a9
Bill Yi [Thu, 27 Oct 2016 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
43905cc9ac -s ours
Change-Id: Ic4ffe5558fbb0baa525e76dbb14031c4d0cedde4
Bill Yi [Thu, 27 Oct 2016 05:04:25 +0000 (05:04 +0000)]
Import translations. DO NOT MERGE
am:
1377e2b985 -s ours
Change-Id: I33398bdb4166839276e72271097684fcd9e02655
Bill Yi [Thu, 27 Oct 2016 05:04:11 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a2b301d0e1 -s ours
am:
68d6955b45 -s ours
Change-Id: I2b21eda80569335e44cf39c087e6dc4590d69d69
Bill Yi [Thu, 27 Oct 2016 05:03:08 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ad45d97c45 -s ours
Change-Id: I3364c6eccecc274568d48f207c59be97ae78b1ce
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE
am:
d1b8917270 -s ours
Change-Id: I6cf22433138b147581a2c055160e2610e0cfc2ce
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE am:
aad661f874 -s ours
am:
f21106b0e8 -s ours
Change-Id: I8b4225b3c88971f17fa97c9bedb0481f78260c23
TreeHugger Robot [Thu, 27 Oct 2016 05:01:32 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:01:03 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Thu, 27 Oct 2016 05:00:34 +0000 (05:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours am:
b9cc1f603c -s ours" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:00:15 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:59:53 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 04:59:49 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
696b0e4d9f -s ours
am:
b9cc1f603c -s ours
Change-Id: I76607e7e8ecbdf03db23955402a626d89f144e31
TreeHugger Robot [Thu, 27 Oct 2016 04:59:28 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE"