OSDN Git Service
Julius D'souza [Wed, 26 Oct 2016 03:42:51 +0000 (03:42 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate am:
82b9aff0a9 am:
4d3af80494
am:
58efe25cd7 -s ours
Change-Id: If9c5ec885dd2994c1c541a3621c60639e5fd4e4f
Julius D'souza [Wed, 26 Oct 2016 03:34:09 +0000 (03:34 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate am:
82b9aff0a9
am:
4d3af80494
Change-Id: Ia54da3fd528bc62c74f607af1e8d45a51bf11918
Julius D'souza [Wed, 26 Oct 2016 03:29:41 +0000 (03:29 +0000)]
DO NOT MERGE: Add initial ambient light sensor rate
am:
82b9aff0a9
Change-Id: I65408c700317d76e271659945fe280318dabe315
TreeHugger Robot [Wed, 26 Oct 2016 00:46:59 +0000 (00:46 +0000)]
Merge "tv.input: Updating tv input hal client with hidl."
Rakesh Iyer [Wed, 26 Oct 2016 00:28:18 +0000 (00:28 +0000)]
Merge "Remove media art from car lock screen."
Rakesh Iyer [Wed, 26 Oct 2016 00:27:49 +0000 (00:27 +0000)]
Merge "Center navigation icons for car nav bar."
Julius D'souza [Tue, 25 Oct 2016 02:26:45 +0000 (19:26 -0700)]
DO NOT MERGE: Add initial ambient light sensor rate
Bug:
32153559
Change-Id: Ic54bded46f88991290ed1e4d2574f865b6f598ec
Jorim Jaggi [Wed, 26 Oct 2016 00:04:06 +0000 (00:04 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295 am:
66a7dc6193 am:
a03792fb24
am:
f2c9eea7ec
Change-Id: I705df5eea2e1efdc5fbcabbff95c56b28ff278d4
Jorim Jaggi [Wed, 26 Oct 2016 00:03:01 +0000 (00:03 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88 am:
1d4f2b9914 am:
ae7f618f38
am:
4bcd7ec40b
Change-Id: Idd47ad1862c093e894d14e1eabb6f05f9733b083
Jorim Jaggi [Tue, 25 Oct 2016 23:55:56 +0000 (23:55 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295 am:
66a7dc6193
am:
a03792fb24
Change-Id: Id1d6dfe8fd3a1553fae50601435b50e8746a7565
Jorim Jaggi [Tue, 25 Oct 2016 23:54:55 +0000 (23:54 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88 am:
1d4f2b9914
am:
ae7f618f38
Change-Id: Ic11164067ce5145771fd0e6f13dcd478c16877f2
Jorim Jaggi [Tue, 25 Oct 2016 23:48:15 +0000 (23:48 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev am:
7e8fc05295
am:
66a7dc6193
Change-Id: I53f230e3f9b6aa18c7d8d2ff41542fbd47c3da5c
Jorim Jaggi [Tue, 25 Oct 2016 23:47:20 +0000 (23:47 +0000)]
Make sure to call dismissKeyguard after setOccluded am:
ec50931d88
am:
1d4f2b9914
Change-Id: I27ef32dfb5963524c0c3efb03058f021799dda07
Romain Guy [Tue, 25 Oct 2016 23:41:53 +0000 (23:41 +0000)]
Merge "Add a half-precision floating point type"
Jorim Jaggi [Tue, 25 Oct 2016 23:39:30 +0000 (23:39 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
am:
7e8fc05295
Change-Id: I30c5c07b6b0308e6161607f7e89302d5af8b7c11
Jorim Jaggi [Tue, 25 Oct 2016 23:39:25 +0000 (23:39 +0000)]
Make sure to call dismissKeyguard after setOccluded
am:
ec50931d88
Change-Id: Ib25480fa4efe63940fed144f4e28dee185244fad
Jorim Jaggi [Tue, 25 Oct 2016 23:32:54 +0000 (23:32 +0000)]
Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev
Christopher Wiley [Tue, 25 Oct 2016 23:18:58 +0000 (23:18 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0 am:
2bb707b1c1 am:
c65ca7708a
am:
a415d687b7
Change-Id: I7dd927246b912593f3138f6e274ed75d8d260e16
Christopher Wiley [Tue, 25 Oct 2016 23:14:52 +0000 (23:14 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0 am:
2bb707b1c1
am:
c65ca7708a
Change-Id: I77da4757155f028889890e80bb79ba56a8371b86
Christopher Wiley [Tue, 25 Oct 2016 23:10:49 +0000 (23:10 +0000)]
Merge "Add script to expedite running passing tests" am:
4d1c2922f0
am:
2bb707b1c1
Change-Id: I42f000895fcba0c12c5301578a791ce17668df3d
Christopher Wiley [Tue, 25 Oct 2016 23:06:51 +0000 (23:06 +0000)]
Merge "Add script to expedite running passing tests"
am:
4d1c2922f0
Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6
TreeHugger Robot [Tue, 25 Oct 2016 22:59:21 +0000 (22:59 +0000)]
Merge "[SettingsLib] Add missing AccessPoint listener"
Treehugger Robot [Tue, 25 Oct 2016 22:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"
Adrian Roos [Tue, 25 Oct 2016 22:48:36 +0000 (22:48 +0000)]
Merge "Move UiMode broadcasts to foreground"
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
Dianne Hackborn [Tue, 25 Oct 2016 22:40:57 +0000 (22:40 +0000)]
Merge "Tweak ActivityManager.getPackageImportance()"
Adrian Roos [Tue, 25 Oct 2016 22:25:06 +0000 (22:25 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours am:
299b57410d -s ours am:
0d280c5a52 -s ours
am:
65bee562c0 -s ours
Change-Id: I58d0facdffd4b7da61d564bab4f5f2c2a214401d
Adrian Roos [Tue, 25 Oct 2016 22:23:57 +0000 (22:23 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours am:
4e2bad2a02 -s ours am:
cd9c84aff5 -s ours
am:
f3ea02119b -s ours
Change-Id: If359f6999825093e1f406709596500a68bdabd92
Adrian Roos [Tue, 25 Oct 2016 22:17:05 +0000 (22:17 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours am:
299b57410d -s ours
am:
0d280c5a52 -s ours
Change-Id: I6198082bc0dce2cccb7818e08e027e1df493ae1b
Adrian Roos [Tue, 25 Oct 2016 22:15:56 +0000 (22:15 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours am:
4e2bad2a02 -s ours
am:
cd9c84aff5 -s ours
Change-Id: I7d4316b8cccf4a2cc5106778d2e20ab5d80a8577
Adrian Roos [Tue, 25 Oct 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev am:
db1fd054d2 -s ours
am:
299b57410d -s ours
Change-Id: Id3b951d73e784b6bb7300d62df7df7957448f185
Adrian Roos [Tue, 25 Oct 2016 22:10:46 +0000 (22:10 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
21984eeaf7 -s ours
am:
4e2bad2a02 -s ours
Change-Id: I578cbe489e705b77689860eb0cea7d79ab6cc4c8
Jakub Pawlowski [Tue, 25 Oct 2016 22:02:54 +0000 (22:02 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218 am:
f169ecb76f am:
f68a0c6dec
am:
94aaa0a705
Change-Id: I6cbff5dba97d53763861b60c015cf6ff349eaa23
Adrian Roos [Tue, 25 Oct 2016 22:02:49 +0000 (22:02 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
am:
db1fd054d2 -s ours
Change-Id: I9f3d116efa02bfca1df96414110722afe143a6dc
Adrian Roos [Tue, 25 Oct 2016 22:02:44 +0000 (22:02 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
21984eeaf7 -s ours
Change-Id: Ia9508033be03059a382abfaaa2adfc3e415df81b
TreeHugger Robot [Tue, 25 Oct 2016 22:00:55 +0000 (22:00 +0000)]
Merge "Apply display override config for secondary displays"
Jakub Pawlowski [Tue, 25 Oct 2016 21:58:48 +0000 (21:58 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218 am:
f169ecb76f
am:
f68a0c6dec
Change-Id: I7d73817cbb42f52f89112416cf7e090f08bec4df
Adrian Roos [Tue, 25 Oct 2016 21:55:49 +0000 (21:55 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev
Jakub Pawlowski [Tue, 25 Oct 2016 21:54:44 +0000 (21:54 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes" am:
8a0a58b218
am:
f169ecb76f
Change-Id: I035eb25c9a320b1760221bc5928919a148801488
Jakub Pawlowski [Tue, 25 Oct 2016 21:47:35 +0000 (21:47 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
am:
8a0a58b218
Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
Adrian Roos [Tue, 25 Oct 2016 21:43:53 +0000 (21:43 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
cb60c7a87e am:
b97cd830e0
am:
fad599e875 -s ours
Change-Id: I69632f432c0fa16d62f63351cbad3fe940068925
Victor Chan [Wed, 24 Aug 2016 21:58:14 +0000 (14:58 -0700)]
Remove media art from car lock screen.
Overriding updateMediaMetaData() in CarStatusBar to ignore updates from
media metadata.
Bug:
31065803
Change-Id: I2078186581f5d66d4d27ebf63451e39a52030a8b
(cherry picked from commit
05e19d01c99bec2b406bbe1e1f0800c1805dcaf4)
Adrian Roos [Tue, 25 Oct 2016 21:39:18 +0000 (21:39 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
cb60c7a87e
am:
b97cd830e0
Change-Id: Ie0ea2eca7a74922d712d5f5bdedd005853f7a44d
Victor Chan [Tue, 16 Aug 2016 23:10:39 +0000 (16:10 -0700)]
Center navigation icons for car nav bar.
The new HVAC design calls for the temperature buttons to be on the
side of the nav bar, at the same position as the nav icons. Decreasing
the width of the button container to 760dp as per go/aae-ncar-por.
Change-Id: Ic2878be0d42cf37ba09bb3aeec68813ad3d1fb8a
(cherry picked from commit
3431cdac24758e7d29cd0e1878f4b6349d2a7950)
TreeHugger Robot [Tue, 25 Oct 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Ambient: If user turned off ambient, keep it off after split"
Jakub Pawlowski [Tue, 25 Oct 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
Adrian Roos [Tue, 25 Oct 2016 21:31:17 +0000 (21:31 +0000)]
Ambient: If user turned off ambient, keep it off after split
am:
cb60c7a87e
Change-Id: I7da07f53de4748462f06a805921e7dcd28637820
TreeHugger Robot [Tue, 25 Oct 2016 21:12:07 +0000 (21:12 +0000)]
Merge "Add the ability to postpone transitions."
Ajay Nadathur [Mon, 24 Oct 2016 23:55:24 +0000 (16:55 -0700)]
[SettingsLib] Add missing AccessPoint listener
- AccessPointListener was not set on AccessPoint in one of the code
paths and as a result, the UI wasn't notified of changes to the
AccessPoint.
Test: Manually tested and verified that notification changes were
delivered to the UI. Also added unit test.
bug:
31945554
Change-Id: I89affada5dead4edc4218f424eec6b7f4a4e26a7
Christopher Wiley [Thu, 20 Oct 2016 19:33:31 +0000 (12:33 -0700)]
Add script to expedite running passing tests
Developers can run this script from within a shell where they have
source'd build/envsetup.sh and lunched a target. It builds, installs,
and runs whitelisted test packages.
Bug: None
Test: This script is useful for iterating rapidly on unittests.
Change-Id: I44c32a0f75da1be2c69a8b1a67c0080a68def738
Dongwon Kang [Wed, 19 Oct 2016 23:12:51 +0000 (16:12 -0700)]
tv.input: Updating tv input hal client with hidl.
Test: end-to-end test with sw hal implementation.
Bug:
32096101
Change-Id: I673b6c8b2cb1f20ae6fce7d201d2a01fca446042
Andrii Kulian [Fri, 21 Oct 2016 18:55:23 +0000 (11:55 -0700)]
Apply display override config for secondary displays
Now display-specific settings, such as dimensions and orientation,
are stored in display override config. For default display it is
mirroring the global config. Each time when global config is updated,
override of the default display should be updated too and vice versa.
Test: Existing and manual tests still pass.
Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
Adrian Roos [Fri, 21 Oct 2016 21:49:17 +0000 (14:49 -0700)]
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: Id80d62727952f63b363f87c19b5befbde8ab5c31
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Merged-In: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Fixes:
32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
Adrian Roos [Fri, 21 Oct 2016 21:49:17 +0000 (14:49 -0700)]
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Fixes:
32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
Adrian Roos [Fri, 21 Oct 2016 21:49:17 +0000 (14:49 -0700)]
Ambient: If user turned off ambient, keep it off after split
The split ambient settings default to on - which is a bad experience
if the user explicitly turned it off before the split.
Change-Id: I346a53b0dc9cdf578c238113f4f33056ba0f3aea
Merged-In: I986d35a1a28e97f4c8d7d3d47ed5658e1836a44f
Fixes:
32332195
Test: Flash angler to NYC, disable ambient, upgrade to NYC-MR1, check if "Lift to check phone" is still off.
TreeHugger Robot [Tue, 25 Oct 2016 19:33:24 +0000 (19:33 +0000)]
Merge "Optimize Fragment operations so that minimal work is done."
Jakub Pawlowski [Mon, 24 Oct 2016 20:56:54 +0000 (13:56 -0700)]
Add helper method to convert Bluetooth UUID to bytes
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
Christopher Wiley [Tue, 25 Oct 2016 18:43:16 +0000 (18:43 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am:
836ffa6e1c am:
c29f2575f2 am:
a7bb5ad809
am:
2ae41619ae
Change-Id: Iee7c8575ee22a494e2657e15e1aaae9b05a37045
Christopher Wiley [Tue, 25 Oct 2016 18:38:33 +0000 (18:38 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am:
836ffa6e1c am:
c29f2575f2
am:
a7bb5ad809
Change-Id: I249e487a26a1fbc8fa748c518fcb332e28598437
Christopher Wiley [Tue, 25 Oct 2016 18:31:02 +0000 (18:31 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired" am:
836ffa6e1c
am:
c29f2575f2
Change-Id: Ica704d0a64dde80ae0a9f1cef0250bfbdafcd49a
Christopher Wiley [Tue, 25 Oct 2016 18:23:02 +0000 (18:23 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am:
836ffa6e1c
Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102
TreeHugger Robot [Tue, 25 Oct 2016 18:22:43 +0000 (18:22 +0000)]
Merge "Fix background animator not resetting"
Treehugger Robot [Tue, 25 Oct 2016 18:12:42 +0000 (18:12 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
Matthew Bouyack [Tue, 25 Oct 2016 17:09:42 +0000 (17:09 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev am:
4f14be3d40 am:
070955608c
am:
46ee88afa8
Change-Id: Ic18392f642e6bff4a91c5a1517341c12fe861ad4
Matthew Bouyack [Tue, 25 Oct 2016 17:08:39 +0000 (17:08 +0000)]
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction. am:
8dd88f649b am:
36d5474ef8
am:
dfe7d0bd0e
Change-Id: Ied2c3314b61f24e7c7a8442adcfbf33a383e65ed
Matthew Bouyack [Tue, 25 Oct 2016 17:02:34 +0000 (17:02 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev am:
4f14be3d40
am:
070955608c
Change-Id: I994154d6c986cc7afe70617d3c38779a7a9b94ac
Matthew Bouyack [Tue, 25 Oct 2016 17:01:32 +0000 (17:01 +0000)]
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction. am:
8dd88f649b
am:
36d5474ef8
Change-Id: Iaca05f400b080d80a5fb1b9b2882d303a836b638
Matthew Bouyack [Tue, 25 Oct 2016 16:55:49 +0000 (16:55 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
am:
4f14be3d40
Change-Id: I730a5872a29236e75b40ff270e279caf6b6da16f
Matthew Bouyack [Tue, 25 Oct 2016 16:55:44 +0000 (16:55 +0000)]
Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction.
am:
8dd88f649b
Change-Id: Id510d1e5653ec167a4494a9ff14728fca446862c
Matthew Bouyack [Tue, 25 Oct 2016 16:48:17 +0000 (16:48 +0000)]
Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
Jorim Jaggi [Tue, 25 Oct 2016 15:31:58 +0000 (08:31 -0700)]
Fix background animator not resetting
Test: Set wallpaper, make sure screen is not black.
Change-Id: I4031375e0892906a4e4085ce05664191a55bfb4e
Fixes:
32375010
Cheryl Potter [Tue, 25 Oct 2016 15:29:30 +0000 (15:29 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7 am:
2e7c67f3cd am:
90d300a0b1 am:
4fdbfbf48d
am:
b2576a6cce
Change-Id: Ia135d813bf5bf65b52f144d25815715c0c52a48e
Cheryl Potter [Tue, 25 Oct 2016 15:24:55 +0000 (15:24 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7 am:
2e7c67f3cd am:
90d300a0b1
am:
4fdbfbf48d
Change-Id: Icd72fc57ab7a2c21509065213c8b292e2c29ed8a
Cheryl Potter [Tue, 25 Oct 2016 15:17:55 +0000 (15:17 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7 am:
2e7c67f3cd
am:
90d300a0b1
Change-Id: Ibcf179723383ad683ad6865a784d1d671fe35015
Cheryl Potter [Tue, 25 Oct 2016 15:14:15 +0000 (15:14 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908 am:
fb4f5497b7
am:
2e7c67f3cd
Change-Id: I489007830f525fa1deaabe6cc78f6b0d41e78a77
Cheryl Potter [Tue, 25 Oct 2016 15:10:22 +0000 (15:10 +0000)]
docs: change gpu debugger redirect b/
31781348 am:
afbf16f908
am:
fb4f5497b7
Change-Id: I1c550fa22586145ec949fe54ef727be814624340
Cheryl Potter [Tue, 25 Oct 2016 15:03:23 +0000 (15:03 +0000)]
docs: change gpu debugger redirect b/
31781348
am:
afbf16f908
Change-Id: I6fa42074ba2fe6019f0bf817a7b21650d2a0dd43
Andrew Scull [Tue, 25 Oct 2016 09:04:55 +0000 (09:04 +0000)]
Merge "Refactor password metric computation."
Bill Yi [Tue, 25 Oct 2016 06:57:02 +0000 (06:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
bf2eaa1029 -s ours am:
2be91e7aff -s ours am:
595fc656e9 -s ours
am:
1b2742a678 -s ours
Change-Id: I446ad5206055709f05ee30f9609e9de35a2e9c8f
Bill Yi [Tue, 25 Oct 2016 06:56:15 +0000 (06:56 +0000)]
Import translations. DO NOT MERGE am:
9ac3087a90 -s ours am:
d091556b6c -s ours am:
a97ce6c84e -s ours
am:
bef31722eb -s ours
Change-Id: I56b97009d5ad7abc916676c0646662070f71fdc6
Bill Yi [Tue, 25 Oct 2016 06:55:21 +0000 (06:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9421be2011 -s ours am:
45b0084348 -s ours am:
02106f20a3 -s ours
am:
63725cbf12 -s ours
Change-Id: If450a2391a3a9e3efb0b8085e42ea1cdb273a728
Bill Yi [Tue, 25 Oct 2016 06:54:26 +0000 (06:54 +0000)]
Import translations. DO NOT MERGE am:
8bea919d37 -s ours am:
3f7cd6f73b -s ours am:
349c365c93 -s ours
am:
90b0b1dd93 -s ours
Change-Id: Ib47c872f7a1f0483dfb133353edd80cb691b2baa
Bill Yi [Tue, 25 Oct 2016 06:51:20 +0000 (06:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours" into nyc-mr2-dev am:
d230d7d15d -s ours
am:
c2c0535871 -s ours
Change-Id: Iabfb1d2b80f952818a7b290e5adb6ab9aeac4936
Bill Yi [Tue, 25 Oct 2016 06:50:25 +0000 (06:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours am:
b1b614671c -s ours
am:
0a4d0a1905 -s ours
Change-Id: Iadc65fe5f3750897f0ad0fb5bcd4085ef8847b8d
Bill Yi [Tue, 25 Oct 2016 06:49:29 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours" into nyc-mr2-dev am:
ddca547792 -s ours
am:
0bdc868a4c -s ours
Change-Id: Id884ab05c086e3b37865ea0ecfa36eb39216a4a9
Bill Yi [Tue, 25 Oct 2016 06:48:31 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours am:
5be5a57151 -s ours
am:
044a1e6aca -s ours
Change-Id: Iec6a6ba863a09fb709968189ab6cc782e0ec6b11
Bill Yi [Tue, 25 Oct 2016 06:47:40 +0000 (06:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3fa41597ab -s ours
am:
e6f4565a7d -s ours
Change-Id: Ibd1ec632819d86d25320b0aa1157ca998b7ca444
Bill Yi [Tue, 25 Oct 2016 06:46:56 +0000 (06:46 +0000)]
Import translations. DO NOT MERGE am:
bf3ad32115 -s ours
am:
f73b3695eb -s ours
Change-Id: I30c9e732e43b7e103f614160ff4c125757a1e636
Bill Yi [Tue, 25 Oct 2016 06:46:03 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
bf2eaa1029 -s ours am:
2be91e7aff -s ours
am:
595fc656e9 -s ours
Change-Id: I9f9a6af3a0757e0414b0e9d7affacbb83afa5b24
Bill Yi [Tue, 25 Oct 2016 06:45:54 +0000 (06:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
840d1f6797 -s ours am:
7c592c96e9 -s ours
am:
b37f7bff18 -s ours
Change-Id: I5ed4e90c9870f47fc4bd45bae21bb53c824a0666
Bill Yi [Tue, 25 Oct 2016 06:45:13 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE am:
9ac3087a90 -s ours am:
d091556b6c -s ours
am:
a97ce6c84e -s ours
Change-Id: Ie8668d2d43a497bc4385620619774cfdc137c1ca
Bill Yi [Tue, 25 Oct 2016 06:45:00 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE am:
6d512da8e7 -s ours am:
8f8f7cc918 -s ours
am:
736c41c2ac -s ours
Change-Id: I11807530a75812eb6c1f9fb8b562fe66ce38ccae
Bill Yi [Tue, 25 Oct 2016 06:44:15 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9421be2011 -s ours am:
45b0084348 -s ours
am:
02106f20a3 -s ours
Change-Id: I27ccf704e40a8393ba82d9b7532453a352831c69
Bill Yi [Tue, 25 Oct 2016 06:43:23 +0000 (06:43 +0000)]
Import translations. DO NOT MERGE am:
8bea919d37 -s ours am:
3f7cd6f73b -s ours
am:
349c365c93 -s ours
Change-Id: Ib149f79a0a04a2785adfe96ab1d4d955106e44d0
Bill Yi [Tue, 25 Oct 2016 06:42:17 +0000 (06:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
44ee15db41 -s ours
am:
72d12a01da -s ours
Change-Id: I12fd476dc5c6c9f2ef1cb96e43bac9ae6b165e60
Bill Yi [Tue, 25 Oct 2016 06:41:25 +0000 (06:41 +0000)]
Import translations. DO NOT MERGE am:
07e46a5d46 -s ours
am:
ae297fe49f -s ours
Change-Id: I6ae1dcc4f062cb2155e5262daf9782be53118366
Bill Yi [Tue, 25 Oct 2016 06:40:20 +0000 (06:40 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours" into nyc-mr2-dev
am:
d230d7d15d -s ours
Change-Id: Icde90b1f0b61ae5b331307b26b5b7ff1836f9022
Bill Yi [Tue, 25 Oct 2016 06:40:14 +0000 (06:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours
am:
b1b614671c -s ours
Change-Id: I152e588b5ab81410544b2584f03d959489906148
Bill Yi [Tue, 25 Oct 2016 06:38:56 +0000 (06:38 +0000)]
Merge "Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours" into nyc-mr2-dev
am:
ddca547792 -s ours
Change-Id: I116f3150b8a20cd02a93b3f01619c4178c318e20
Bill Yi [Tue, 25 Oct 2016 06:38:50 +0000 (06:38 +0000)]
Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours
am:
5be5a57151 -s ours
Change-Id: I70452a8fe24a4b32d21f609e15d4eeaf9704b850
OSDN Git Service
