OSDN Git Service
Sergei Vasilinetc [Fri, 28 Oct 2016 01:30:56 +0000 (01:30 +0000)]
Merge changes I94b1c31c,Ib0b16c87
* changes:
Add target to texture
Use Bitmap in Texture.upload
TreeHugger Robot [Fri, 28 Oct 2016 00:52:24 +0000 (00:52 +0000)]
Merge "Perform onDestroy when FragmentController is torn down."
Fyodor Kupolov [Fri, 28 Oct 2016 00:49:18 +0000 (00:49 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0 am:
74bd9b1f56 am:
9b006e28f9
am:
8b44db55d3 -s ours
Change-Id: I6c478eea6884184098c783eea507ece48f54bee6
Fyodor Kupolov [Fri, 28 Oct 2016 00:48:18 +0000 (00:48 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d am:
c9102f2ae2
am:
f4fba91b5f -s ours
Change-Id: Id759489caebf38b93bda790e8d36827d6635aac4
Fyodor Kupolov [Fri, 28 Oct 2016 00:40:22 +0000 (00:40 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0 am:
74bd9b1f56
am:
9b006e28f9
Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
Fyodor Kupolov [Fri, 28 Oct 2016 00:39:12 +0000 (00:39 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d
am:
c9102f2ae2
Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
Fyodor Kupolov [Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0
am:
74bd9b1f56
Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
Fyodor Kupolov [Fri, 28 Oct 2016 00:30:43 +0000 (00:30 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6
am:
7c9a91094d
Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:12 +0000 (00:21 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
am:
e97969b4d0
Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:10 +0000 (00:21 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified
am:
b87a491de6
Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
TreeHugger Robot [Fri, 28 Oct 2016 00:11:11 +0000 (00:11 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 23:47:29 +0000 (23:47 +0000)]
Merge "Correctly use ByteBuffer in UsbRequest"
Sudheer Shanka [Thu, 27 Oct 2016 22:38:31 +0000 (22:38 +0000)]
Merge "Move IMountService to aidl."
Fyodor Kupolov [Thu, 27 Oct 2016 01:36:57 +0000 (18:36 -0700)]
[DO NOT MERGE] Only setSize if -s arg is specified
Calculate size of installed APKs only when INSTALL_EXTERNAL flag is set.
calculateInstalledSize is expensive and may take up to 20% of total
installation time.
Bug:
32180551
Bug:
29932779
Change-Id: I173d2b38820cc86cbfacecd1bacef57369d10af7
George Mount [Thu, 27 Oct 2016 21:22:27 +0000 (14:22 -0700)]
Perform onDestroy when FragmentController is torn down.
Bug
32457575
Test: I9e33801c34bcb31e3d6ca0df3962cfe1a3203044
Change-Id: Id220dbfb3e42d2c91b99926c1e9b0c556c9b453a
Jeff Sharkey [Thu, 27 Oct 2016 20:48:46 +0000 (20:48 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221 am:
32dcd2cad4 am:
99bfb0dcaa
am:
4c7a2fac3b
Change-Id: I2cc189e52cf8bdd4b8d92e2a347cc0fea24dc433
Jeff Sharkey [Thu, 27 Oct 2016 20:47:49 +0000 (20:47 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d am:
eeac5a064d am:
f46b2eeab6
am:
ed8259f3fd
Change-Id: Ide6ce44649aba7eea6d0a3395d2e21e00fff2d07
Jeff Sharkey [Thu, 27 Oct 2016 20:38:54 +0000 (20:38 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221 am:
32dcd2cad4
am:
99bfb0dcaa
Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a
Jeff Sharkey [Thu, 27 Oct 2016 20:37:32 +0000 (20:37 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d am:
eeac5a064d
am:
f46b2eeab6
Change-Id: If4c4ab8ddd7e15a93de6422d8724077f158b1047
Michael Kwan [Thu, 27 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am:
07192ff60a am:
4e830d259a
am:
bf6a177198
Change-Id: I09aba54f0d3bfc17861ccef2aba836751af7adb0
Jeff Sharkey [Thu, 27 Oct 2016 20:28:44 +0000 (20:28 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am:
286f069221
am:
32dcd2cad4
Change-Id: Iebf13cac5308c3763c90219407437a5d010cd27e
Michael Kwan [Thu, 27 Oct 2016 20:27:56 +0000 (20:27 +0000)]
Update progress bar and progress dialog to match UX specs for watch. am:
f930e5b99b am:
c8eb232ba3
am:
05aed4e0cd
Change-Id: Ibdb760acf53a302db8060b78d98cb48dbca0874b
Jeff Sharkey [Thu, 27 Oct 2016 20:27:54 +0000 (20:27 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am:
7765d7320d
am:
eeac5a064d
Change-Id: If0fcf46d1f73662dbc774403e8d9be62585ef4a5
Jeff Sharkey [Thu, 27 Oct 2016 20:23:26 +0000 (20:23 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
am:
286f069221
Change-Id: Ie24d27d010b355896e92b911d574576f42417b9b
Jeff Sharkey [Thu, 27 Oct 2016 20:23:23 +0000 (20:23 +0000)]
Only bind to RESOLVE_EPHEMERAL_PACKAGE once.
am:
7765d7320d
Change-Id: I2ca3b6d7938a461a6fe2d591b74985908c2d07bc
Michael Kwan [Thu, 27 Oct 2016 20:20:07 +0000 (20:20 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am:
07192ff60a
am:
4e830d259a
Change-Id: Iaaa3618b497ec0d547f83e3b5677fd322f7015b3
Michael Kwan [Thu, 27 Oct 2016 20:19:03 +0000 (20:19 +0000)]
Update progress bar and progress dialog to match UX specs for watch. am:
f930e5b99b
am:
c8eb232ba3
Change-Id: I56297d399965b2b03dc41b2cc9d6237c7762c03f
Jeff Sharkey [Thu, 27 Oct 2016 20:18:19 +0000 (20:18 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once."
Jeff Sharkey [Thu, 27 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev
Michael Kwan [Thu, 27 Oct 2016 20:14:07 +0000 (20:14 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
am:
07192ff60a
Change-Id: I31c220c68e142cb15b7e6801a88a1aff853229b2
Michael Kwan [Thu, 27 Oct 2016 20:13:59 +0000 (20:13 +0000)]
Update progress bar and progress dialog to match UX specs for watch.
am:
f930e5b99b
Change-Id: I5123bba1819fe4841184bcab9cc65d0418c3b2a5
TreeHugger Robot [Thu, 27 Oct 2016 20:06:15 +0000 (20:06 +0000)]
Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 19:42:13 +0000 (19:42 +0000)]
Merge "Log removeUser"
Sudheer Shanka [Wed, 19 Oct 2016 00:15:18 +0000 (17:15 -0700)]
Move IMountService to aidl.
Bug:
30977067
Test: Existing tests passing.
Change-Id: Icadfdcbc79708d3826b4e11afe35f5963aabcd4c
Rob Carr [Thu, 27 Oct 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Disable seamless rotation when nav bar jumps."
TreeHugger Robot [Thu, 27 Oct 2016 19:09:23 +0000 (19:09 +0000)]
Merge "Dumps total size of primary storage."
TreeHugger Robot [Thu, 27 Oct 2016 18:41:30 +0000 (18:41 +0000)]
Merge changes from topic 'always_on'
* changes:
AmbientDisplay: Fixed threading
AmbientDisplay: Factor out DozeSensors
Fyodor Kupolov [Thu, 27 Oct 2016 18:21:47 +0000 (18:21 +0000)]
Merge "Use app context to avoid memory leaks"
Fyodor Kupolov [Thu, 27 Oct 2016 18:00:29 +0000 (11:00 -0700)]
Log removeUser
Test: manual
Bug:
32455935
Change-Id: If1756725a428278ec21aa4d2cccce0da6079c22b
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
Philip P. Moltmann [Wed, 19 Oct 2016 00:43:37 +0000 (17:43 -0700)]
Correctly use ByteBuffer in UsbRequest
Meaning: Read/Write to correct area in buffer, set position correectly.
- Create a new method UsbRequest#enqueue that has correct behavior, deprecate
UsbRequest#queue.
- Move all description of the weird (legacy) UsbRequest#queue behavior to
this method.
Change-Id: Ibeed400b4ad2aa9d005ace345c7895a3dc4ba1ad
Fixes:
31050148
Test: Submitted alongside
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
OSDN Git Service
