OSDN Git Service
Jorim Jaggi [Wed, 26 Oct 2016 17:41:29 +0000 (17:41 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9 am:
b5fed003cc
am:
bb139c5633
Change-Id: I31d905372f37c3002212d3b7f49144e0b7812269
Jorim Jaggi [Wed, 26 Oct 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9
am:
b5fed003cc
Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec
Jorim Jaggi [Wed, 26 Oct 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix animation sequence for upload tasks"
am:
7f2676a3d9
Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"
Brad Ebinger [Wed, 26 Oct 2016 16:53:57 +0000 (16:53 +0000)]
Merge "Add support for starting external Sessions" am:
4ce60695f9 am:
9bec1a5095
am:
2504343fcd
Change-Id: I8c8919377f1aa953fc798ce8fd431afb25104e78
Brad Ebinger [Wed, 26 Oct 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add support for starting external Sessions" am:
4ce60695f9
am:
9bec1a5095
Change-Id: Ie0b4ca75d34f8489483bd274e7902d3de67703fa
Brad Ebinger [Wed, 26 Oct 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Add support for starting external Sessions"
am:
4ce60695f9
Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"
Andreas Huber [Wed, 26 Oct 2016 15:58:50 +0000 (15:58 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am:
c3d8550cf3 am:
8bd63a39f3
am:
63f0ebc7a8
Change-Id: I4eeb088c4de6e13f4e939e847dd1ab62b9d91d6a
Andreas Huber [Wed, 26 Oct 2016 15:54:20 +0000 (15:54 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup." am:
c3d8550cf3
am:
8bd63a39f3
Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062
Andreas Huber [Wed, 26 Oct 2016 15:49:52 +0000 (15:49 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
am:
c3d8550cf3
Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
Andreas Huber [Wed, 26 Oct 2016 15:38:44 +0000 (15:38 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
Julius D'souza [Wed, 26 Oct 2016 03:35:16 +0000 (03:35 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev am:
1e0055bb51
am:
24dcd11841
Change-Id: I5e61f68e635a8a86b4fa8a1aaafe692431be5b91
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:49 +0000 (03:29 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
am:
1e0055bb51
Change-Id: If6b70c76c4e16634175667ca58b69077c5e54c61
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
Julius D'souza [Wed, 26 Oct 2016 03:23:17 +0000 (03:23 +0000)]
Merge "DO NOT MERGE: Add initial ambient light sensor rate" into cw-f-dev
Zhao Wei Liew [Mon, 14 Sep 2015 13:41:57 +0000 (21:41 +0800)]
Fix animation sequence for upload tasks
stat_sys_upload_anim2 and stat_sys_upload_anim1 are reversed,
resulting in an animation that jumps from one frame to the
following frame and back again.
Change-Id: Ibb9c6c4ff992895dce26a283f1ee9a81f7cdee15
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 [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
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: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:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"
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
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
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:39:18 +0000 (21:39 +0000)]
Ambient: If user turned off ambient, keep it off after split am:
cb60c7a87e
am:
b97cd830e0
Change-Id: Ie0ea2eca7a74922d712d5f5bdedd005853f7a44d
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
Brad Ebinger [Fri, 21 Oct 2016 16:41:29 +0000 (09:41 -0700)]
Add support for starting external Sessions
This change adds support for parceling Session Information to be
transmitted over AIDLs and starting an external session in the external
process.
Test: Telecom Unit tests and new SessionManager Tests.
Bug:
26571395
Change-Id: Ie27ed88d4a8c344b34568025ddcf150fdcb38d62
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
Andreas Huber [Tue, 25 Oct 2016 20:29:30 +0000 (13:29 -0700)]
Adds support for specifying the version of a service to register/lookup.
Bug:
32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591
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: 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.
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: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:12:42 +0000 (18:12 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
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
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
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: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: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: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
Bill Yi [Tue, 25 Oct 2016 06:37:26 +0000 (06:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3fa41597ab -s ours
Change-Id: I27367eddd1abbe0e8416f54808f128652d622fb0
Bill Yi [Tue, 25 Oct 2016 06:37:22 +0000 (06:37 +0000)]
Import translations. DO NOT MERGE
am:
bf3ad32115 -s ours
Change-Id: If70290bcea12d646ddb44ea1a635b197b82eebe6
Bill Yi [Tue, 25 Oct 2016 06:36:29 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
bf2eaa1029 -s ours
am:
2be91e7aff -s ours
Change-Id: Icab5326419697a45d9338f0dbc57aa24eb3ac99a
Bill Yi [Tue, 25 Oct 2016 06:36:29 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
840d1f6797 -s ours
am:
7c592c96e9 -s ours
Change-Id: I883110e09fdaad059ac4701b4add4000e0ac7f14
Bill Yi [Tue, 25 Oct 2016 06:35:46 +0000 (06:35 +0000)]
Import translations. DO NOT MERGE am:
9ac3087a90 -s ours
am:
d091556b6c -s ours
Change-Id: I1f27d69564e4601a45cf21cef2149a65130cc0de
Bill Yi [Tue, 25 Oct 2016 06:35:40 +0000 (06:35 +0000)]
Import translations. DO NOT MERGE am:
6d512da8e7 -s ours
am:
8f8f7cc918 -s ours
Change-Id: Ica051b105781401aeedb5a89abaac033a7184b61
Bill Yi [Tue, 25 Oct 2016 06:35:04 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
9421be2011 -s ours
am:
45b0084348 -s ours
Change-Id: Ib0d3db1215adf01d90643e55aea65ad2f2ff2073
Bill Yi [Tue, 25 Oct 2016 06:34:24 +0000 (06:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
44ee15db41 -s ours
Change-Id: Ie4475bcf0b48b0297748d0f527d6fc707c2fd3dc
Bill Yi [Tue, 25 Oct 2016 06:34:20 +0000 (06:34 +0000)]
Import translations. DO NOT MERGE
am:
07e46a5d46 -s ours
Change-Id: I970027fabb814e91ae0a07ff9869b17bec5c3099
Bill Yi [Tue, 25 Oct 2016 06:34:17 +0000 (06:34 +0000)]
Import translations. DO NOT MERGE am:
8bea919d37 -s ours
am:
3f7cd6f73b -s ours
Change-Id: I471ace1f6bfd71059e2c3f713d6385064988ada3
Android Build Merger (Role) [Tue, 25 Oct 2016 06:29:58 +0000 (06:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
a0980e58e4 -s ours" into nyc-mr2-dev
Android Build Merger (Role) [Tue, 25 Oct 2016 06:29:39 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE am:
b3a6a7afe4 -s ours" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:29:33 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 25 Oct 2016 06:29:00 +0000 (06:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
a0980e58e4 -s ours
Change-Id: Ib33e112eda5af530b41bb65ad393e2f9b61ac6c1
Bill Yi [Tue, 25 Oct 2016 06:28:59 +0000 (06:28 +0000)]
Import translations. DO NOT MERGE
am:
b3a6a7afe4 -s ours
Change-Id: I2a8b9850a1effd799a88210e55c6183605c0f046
Bill Yi [Tue, 25 Oct 2016 06:28:33 +0000 (06:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
46f6582d84 -s ours
Change-Id: Ibec3557681ab54be71109d728121b13a6a5df182
Bill Yi [Tue, 25 Oct 2016 06:28:28 +0000 (06:28 +0000)]
Import translations. DO NOT MERGE
am:
6744706608 -s ours
Change-Id: I6dfb62713943ebeacb5a725d9234fde3b9f97e0c
Bill Yi [Tue, 25 Oct 2016 06:27:49 +0000 (06:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
840d1f6797 -s ours
Change-Id: I7fcaa6ea865885d085284c58ccb71a29f275020b
Bill Yi [Tue, 25 Oct 2016 06:27:48 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE
am:
6d512da8e7 -s ours
Change-Id: I01407ceed1d3f8a28b956e156100adc6960f61f4
Bill Yi [Tue, 25 Oct 2016 06:25:44 +0000 (06:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
bf2eaa1029 -s ours
Change-Id: Ib09d545a5ad307e82c04136c57c10fc33eddce48
Bill Yi [Tue, 25 Oct 2016 06:25:41 +0000 (06:25 +0000)]
Import translations. DO NOT MERGE
am:
9ac3087a90 -s ours
Change-Id: I0ef3029490ded71a1145ba8c4b46e7263b938a54
Bill Yi [Tue, 25 Oct 2016 06:24:23 +0000 (06:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
9421be2011 -s ours
Change-Id: Id624f18f91ebf282cf8a5498f0c0b4c6682ea89e
Bill Yi [Tue, 25 Oct 2016 06:24:20 +0000 (06:24 +0000)]
Import translations. DO NOT MERGE
am:
8bea919d37 -s ours
Change-Id: I67c3a96bfa8497980eb80b993a8861d6b13de029
TreeHugger Robot [Tue, 25 Oct 2016 06:23:08 +0000 (06:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:22:39 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:22:03 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:21:14 +0000 (06:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:19:58 +0000 (06:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 25 Oct 2016 06:19:06 +0000 (06:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev