OSDN Git Service
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:19:57 +0000 (12:19 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88 am:
29d6af7fe7
am:
0cf19a9a27
Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Mitchell Wills [Fri, 28 Oct 2016 06:35:28 +0000 (06:35 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
a657136264
Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 05:04:31 +0000 (05:04 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
77281bbaf4 -s ours
am:
e1d1740534
Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 03:01:56 +0000 (03:01 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21 am:
81d5ecb7a6
am:
61d0088923
Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours am:
98f664b903
am:
7ad32238f6
Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
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
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
Jakub Pawlowski [Wed, 26 Oct 2016 20:05:30 +0000 (13:05 -0700)]
Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.
Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:
28715749
Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit
ac69be543f89ea6e9a27204492e0a170d9b3450e)
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
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
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
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: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
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
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)
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
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
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
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
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
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
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
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: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: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)]
Import translations. DO NOT MERGE am:
d1b8917270 -s ours
am:
6296c78ee4 -s ours
Change-Id: I9396a152c47e270c7660f46dca006468d26306c6
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: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: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
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
Bill Yi [Thu, 27 Oct 2016 04:59:00 +0000 (04:59 +0000)]
Import translations. DO NOT MERGE am:
c541a19fba -s ours
am:
18608133d8 -s ours
Change-Id: I56489534a775a003ca0e5863bedafe2201e38c28
TreeHugger Robot [Thu, 27 Oct 2016 04:58:33 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:56:58 +0000 (04:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a2b301d0e1 -s ours
Change-Id: I33dcb6841acdee235a66dcf4f0900ee6cc041090
OSDN Git Service
