OSDN Git Service
Narayan Kamath [Mon, 14 Nov 2016 13:47:59 +0000 (13:47 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8 am:
3e85db46bc am:
5ad1a52678
am:
8ff9e7104c
Change-Id: I818d6006fd3af80313e1d903f94f2a6e1fcb52ef
Narayan Kamath [Mon, 14 Nov 2016 13:46:47 +0000 (13:46 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7 am:
56294db4d4 am:
8fecc8687b
am:
9f37c28a17
Change-Id: I472cd78ae1b956126feea81dd619310c44d4801a
Hugo Benichi [Mon, 14 Nov 2016 13:45:24 +0000 (13:45 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204 am:
fd3e6e8d25 am:
bfa2fed779
am:
fb2b64d037
Change-Id: Ic4c6875e06bd4eddd32cff43054c84bd5fa326fd
Hugo Benichi [Mon, 14 Nov 2016 13:44:05 +0000 (13:44 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c am:
1d61b01a5d am:
9a6f65608a
am:
6db87b6e2a
Change-Id: I81963b856cc76598555fb51fb27874d22c543fcb
Narayan Kamath [Mon, 14 Nov 2016 13:36:02 +0000 (13:36 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8 am:
3e85db46bc
am:
5ad1a52678
Change-Id: I0e6cfed1a3fac9ba0cf45c4148fbb7fe077fd624
Narayan Kamath [Mon, 14 Nov 2016 13:35:02 +0000 (13:35 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7 am:
56294db4d4
am:
8fecc8687b
Change-Id: Ie17f7a15e86b88d9fef7edc43919bc3669ba5acf
Hugo Benichi [Mon, 14 Nov 2016 13:33:55 +0000 (13:33 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204 am:
fd3e6e8d25
am:
bfa2fed779
Change-Id: I7c2d9158c7395a35b92ad74535cff704e6b897f4
Hugo Benichi [Mon, 14 Nov 2016 13:32:50 +0000 (13:32 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c am:
1d61b01a5d
am:
9a6f65608a
Change-Id: I91630e0cdfff69cfcea1e680fae1db34541cc8de
Narayan Kamath [Mon, 14 Nov 2016 13:23:48 +0000 (13:23 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8
am:
3e85db46bc
Change-Id: I880788deb83685b523641097bf336d3233faad96
Narayan Kamath [Mon, 14 Nov 2016 13:22:32 +0000 (13:22 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7
am:
56294db4d4
Change-Id: Icc973e244e150d786c21a22ce63ae85232a115c2
Hugo Benichi [Mon, 14 Nov 2016 13:21:26 +0000 (13:21 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204
am:
fd3e6e8d25
Change-Id: I154015353cdab13732d82e02e277139511f797f4
Hugo Benichi [Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c
am:
1d61b01a5d
Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515
Narayan Kamath [Mon, 14 Nov 2016 13:15:47 +0000 (13:15 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d
am:
a13068a1c8
Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790
Narayan Kamath [Mon, 14 Nov 2016 13:10:53 +0000 (13:10 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c
am:
53af5fe3f7
Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13
Hugo Benichi [Mon, 14 Nov 2016 13:09:34 +0000 (13:09 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce
am:
4bdf37c204
Change-Id: Ida3b6e2739f273228826f1536e2573d9456c2956
Hugo Benichi [Mon, 14 Nov 2016 13:08:26 +0000 (13:08 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours
am:
bdf4d8a93c
Change-Id: Ifc38d9a9e7afedd6bf5af2876f4d1dfdf430dd02
Narayan Kamath [Mon, 14 Nov 2016 13:07:49 +0000 (13:07 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b
am:
65abe1066d
Change-Id: Id11cf7f2b1dbf1db6eb047f1e2015689d733ab69
Narayan Kamath [Mon, 14 Nov 2016 12:57:59 +0000 (12:57 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b
am:
59e6dccb4c
Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99
Hugo Benichi [Mon, 14 Nov 2016 12:56:47 +0000 (12:56 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9
am:
37cacc77ce
Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6
Hugo Benichi [Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
am:
476da32d86 -s ours
Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f
Narayan Kamath [Mon, 14 Nov 2016 12:51:41 +0000 (12:51 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7
am:
8e6e5a157b
Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
Narayan Kamath [Mon, 14 Nov 2016 12:50:15 +0000 (12:50 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e
am:
d17867203b
Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
Hugo Benichi [Mon, 14 Nov 2016 12:49:00 +0000 (12:49 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae
am:
afa3694ea9
Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417
Hugo Benichi [Fri, 11 Nov 2016 02:24:23 +0000 (11:24 +0900)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
Jakub Pawlowski [Sat, 12 Nov 2016 00:11:19 +0000 (00:11 +0000)]
Merge "Bluetooth: advertising improvements" am:
82c9ba9c55 am:
e3b71cd572
am:
d81df46e80
Change-Id: I7e17eac0305832d69366b565427ec048a7166357
Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:37 +0000 (00:08 +0000)]
Merge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am:
954347fb1b" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:08 +0000 (00:08 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity. am:
c13df1eb30" into nyc-mr2-dev-plus-aosp
Manu Cornet [Sat, 12 Nov 2016 00:06:57 +0000 (00:06 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
am:
954347fb1b
Change-Id: Ia1fd6ab09d6310575bdbceba1d56f0a58160331f
Manu Cornet [Sat, 12 Nov 2016 00:06:49 +0000 (00:06 +0000)]
DO NOT MERGE - 2-dimensional Recents activity.
am:
c13df1eb30
Change-Id: Idfcea35ba54b69e780bb9159055ea296dd9f14a9
Robert Sesek [Sat, 12 Nov 2016 00:06:34 +0000 (00:06 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()." am:
b828b6bf6c am:
a0d2e6f4b7
am:
057e9c16e7
Change-Id: I96c16db9b8fcd197709179429de07a77cbabe5e8
Marie Janssen [Sat, 12 Nov 2016 00:05:19 +0000 (00:05 +0000)]
Merge "Bluetooth: BLE app tracking fixes" am:
2174731449 am:
3d8d5dbb56
am:
56853771ae
Change-Id: I2c0ac6fd2047643ae3c1e6450397b2cd9eed7e94
Jakub Pawlowski [Fri, 11 Nov 2016 23:58:44 +0000 (23:58 +0000)]
Merge "Bluetooth: advertising improvements" am:
82c9ba9c55
am:
e3b71cd572
Change-Id: I54df9c355ac951d40b2d8e865d5f36f8875ce71f
Robert Sesek [Fri, 11 Nov 2016 23:55:18 +0000 (23:55 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()." am:
b828b6bf6c
am:
a0d2e6f4b7
Change-Id: I4044e01b9de9bc502eda18fc34182629ca524701
Marie Janssen [Fri, 11 Nov 2016 23:53:47 +0000 (23:53 +0000)]
Merge "Bluetooth: BLE app tracking fixes" am:
2174731449
am:
3d8d5dbb56
Change-Id: Ia9b8950f66f31b0d3b78f6e2f6c2314cf0b931f0
Jakub Pawlowski [Fri, 11 Nov 2016 23:48:51 +0000 (23:48 +0000)]
Merge "Bluetooth: advertising improvements"
am:
82c9ba9c55
Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb
TreeHugger Robot [Fri, 11 Nov 2016 23:46:26 +0000 (23:46 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
Robert Sesek [Fri, 11 Nov 2016 23:44:49 +0000 (23:44 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am:
b828b6bf6c
Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17
Marie Janssen [Fri, 11 Nov 2016 23:41:42 +0000 (23:41 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
am:
2174731449
Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141
Kevin Hufnagle [Fri, 11 Nov 2016 23:40:43 +0000 (23:40 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am:
867d09fe18 am:
5584ee2131
am:
d733ff11ea
Change-Id: I323b294af1ea7b4a86d5eef7bd7670c965e1b5bf
Makoto Onuki [Fri, 11 Nov 2016 23:36:04 +0000 (23:36 +0000)]
App Shortcut: Clarify which attributes must be resources am:
104f805337 am:
2a3fe7d979
am:
b0fd5ba122
Change-Id: I4780d09f8b692dbe76f1726a436f9693281fd488
Rati Agrawal [Fri, 11 Nov 2016 23:34:32 +0000 (23:34 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev am:
87d764f184
am:
9261740a8b
Change-Id: Ib93bfac0e85da0aaa582924c981f59e52f45ea8e
Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Bluetooth: advertising improvements"
Phil Weaver [Fri, 11 Nov 2016 23:29:59 +0000 (23:29 +0000)]
Add check for null manger for a11y recents action am:
2585033100
am:
0cd036da23
Change-Id: Ic10e13d83bd6cb2dab3b445e8b5ec41a45e08fa6
Jakub Pawlowski [Fri, 4 Nov 2016 22:25:57 +0000 (15:25 -0700)]
Bluetooth: advertising improvements
This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.
Bug:
30622771
Bug:
24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026
Treehugger Robot [Fri, 11 Nov 2016 23:25:43 +0000 (23:25 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
Kevin Hufnagle [Fri, 11 Nov 2016 23:23:20 +0000 (23:23 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am:
867d09fe18
am:
5584ee2131
Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486
Treehugger Robot [Fri, 11 Nov 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
Makoto Onuki [Fri, 11 Nov 2016 23:22:08 +0000 (23:22 +0000)]
App Shortcut: Clarify which attributes must be resources am:
104f805337
am:
2a3fe7d979
Change-Id: I7858db41a362e3be0a8668f23476b082e8140f43
Rati Agrawal [Fri, 11 Nov 2016 23:17:43 +0000 (23:17 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev
am:
87d764f184
Change-Id: I4b1424314f9b8bd1c2d463e2a3c62c90bbe107e8
Phil Weaver [Fri, 11 Nov 2016 23:17:41 +0000 (23:17 +0000)]
Add check for null manger for a11y recents action
am:
2585033100
Change-Id: I9b5977ad876048e5c527ff1f8ef6b989283a0e73
Kevin Hufnagle [Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
am:
867d09fe18
Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9
Makoto Onuki [Fri, 11 Nov 2016 23:14:22 +0000 (23:14 +0000)]
App Shortcut: Clarify which attributes must be resources
am:
104f805337
Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7
Rati Agrawal [Fri, 11 Nov 2016 23:03:30 +0000 (23:03 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev
Yigit Boyar [Fri, 11 Nov 2016 22:53:17 +0000 (22:53 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am:
7cd6c3a084 am:
4e49a3a008
am:
00ab52e3a2
Change-Id: I135b0f83c5041e5467a808694fc93408d63a75d1
Yigit Boyar [Fri, 11 Nov 2016 22:52:01 +0000 (22:52 +0000)]
List all methods that change data in the docs am:
42c69b9ce4 am:
7e6fdaab69
am:
93f130e232
Change-Id: Id95fff602b22d376cfd81fbafdc22fac376a644c
Yigit Boyar [Fri, 11 Nov 2016 22:46:32 +0000 (22:46 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am:
7cd6c3a084
am:
4e49a3a008
Change-Id: I8b40b32c181ceab9b53e3593c11f5f716b27c1d7
Kevin Hufnagle [Fri, 11 Nov 2016 22:44:01 +0000 (22:44 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
Yigit Boyar [Fri, 11 Nov 2016 22:39:25 +0000 (22:39 +0000)]
List all methods that change data in the docs am:
42c69b9ce4
am:
7e6fdaab69
Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef
Yigit Boyar [Fri, 11 Nov 2016 22:31:21 +0000 (22:31 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
am:
7cd6c3a084
Change-Id: I1eb87e80c76d7229dab716a3c3e7bf35104f59c5
Yigit Boyar [Fri, 11 Nov 2016 22:31:15 +0000 (22:31 +0000)]
List all methods that change data in the docs
am:
42c69b9ce4
Change-Id: I0808918c44981da63ace801c486d442ff1a99700
Yigit Boyar [Fri, 11 Nov 2016 22:14:11 +0000 (22:14 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
Manu Cornet [Fri, 11 Nov 2016 19:36:08 +0000 (11:36 -0800)]
DO NOT MERGE - 2-dimensional Recents activity.
This is a simple first version in the spirit of small, incremental CLs.
It is fully functional but the following will come in later changes:
* Split screen support
* Potential animations
* Alt-tab behavior
* Relayout on orientation changes
The new activity is only started when a specific system property is set.
Test: Tested new activity behavior on local Ryu. Added tests for layout logic.
Bug:
32101881
Merged-In: I550f6e7ea0de3937dbf80e5f0294676cfe567d47
Change-Id: I46a537646e98b312d831510e1d331948888ae5ce
Marco Nelissen [Fri, 11 Nov 2016 20:22:58 +0000 (20:22 +0000)]
Merge "Make AmrInputStream use MediaCodec" am:
866658261f am:
618c1a9ae6
am:
fd91fcc970
Change-Id: Ib32029cce0ce9b7d6b0c51ad9a5e141b40a34304
Marco Nelissen [Fri, 11 Nov 2016 20:16:00 +0000 (20:16 +0000)]
Merge "Make AmrInputStream use MediaCodec" am:
866658261f
am:
618c1a9ae6
Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb
Jack Yu [Fri, 11 Nov 2016 20:11:02 +0000 (20:11 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API" am:
4469e48d5c am:
3cfa510779
am:
d517ea753f
Change-Id: Iaa642d19d006133a8d378a43253aaa35053db564
Marco Nelissen [Fri, 11 Nov 2016 20:10:00 +0000 (20:10 +0000)]
Merge "Make AmrInputStream use MediaCodec"
am:
866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
Jack Yu [Fri, 11 Nov 2016 19:57:55 +0000 (19:57 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API" am:
4469e48d5c
am:
3cfa510779
Change-Id: I65746e4959851eb4662881db4fd8d9665070da71
Treehugger Robot [Fri, 11 Nov 2016 19:54:38 +0000 (19:54 +0000)]
Merge "Make AmrInputStream use MediaCodec"
Jack Yu [Fri, 11 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
am:
4469e48d5c
Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
Bill Yi [Fri, 11 Nov 2016 19:45:44 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
11ea7e4283 -s ours
am:
5e123b336a -s ours
Change-Id: Ia7407399c911d052bc2086646d275767b094e21c
Bill Yi [Fri, 11 Nov 2016 19:44:30 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE am:
b8aaaa8949 -s ours
am:
c967ede5c8 -s ours
Change-Id: I8ebb662bfa9ad1a4e1b3ef14d9f221e5aadf6c69
Jack Yu [Fri, 11 Nov 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
Bill Yi [Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
11ea7e4283 -s ours
Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a
Bill Yi [Fri, 11 Nov 2016 19:37:53 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE
am:
b8aaaa8949 -s ours
Change-Id: I5b120c2d816f8ba20ad443c9dbbdf5797e85923a
Bill Yi [Fri, 11 Nov 2016 19:33:17 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
3cf37c7dc3 -s ours
am:
500e07de70 -s ours
Change-Id: I2d593fdb256d9e4284e36b0f729b778742cb172f
Bill Yi [Fri, 11 Nov 2016 19:31:56 +0000 (19:31 +0000)]
Import translations. DO NOT MERGE am:
e65092639f -s ours
am:
5d51ac0da1 -s ours
Change-Id: I47f1c79b28a752a33d536a3f8af6849bd94b3980
TreeHugger Robot [Fri, 11 Nov 2016 19:29:57 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:25:23 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
3cf37c7dc3 -s ours
Change-Id: I4593fb756b4ef79571712e707fcaeadd7da14968
Bill Yi [Fri, 11 Nov 2016 19:25:22 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am:
e65092639f -s ours
Change-Id: I6d7024e618d7092b283d52e068d0f1a2646e8a46
Bill Yi [Fri, 11 Nov 2016 19:24:52 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d9c8da1283 -s ours
am:
f2790ac31d -s ours
Change-Id: I7ed9d9242eaa1ceed6a939315151c0b708f5cf0b
Bill Yi [Fri, 11 Nov 2016 19:23:45 +0000 (19:23 +0000)]
Import translations. DO NOT MERGE am:
05a48e2a3d -s ours
am:
edbd698183 -s ours
Change-Id: Ia21b544c178b56f1d45c674c34ae4407d5cf123c
Bill Yi [Fri, 11 Nov 2016 19:20:01 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c6c0d901bf -s ours
am:
8c8e6ef26a -s ours
Change-Id: I664949ebf418b8d9a8d3a5e80b13caa184ab7df8
Bill Yi [Fri, 11 Nov 2016 19:20:00 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d9c8da1283 -s ours
Change-Id: I9514e9874725fe1dab83d32869ea6a3ef83248f7
Bill Yi [Fri, 11 Nov 2016 19:19:59 +0000 (19:19 +0000)]
Import translations. DO NOT MERGE
am:
05a48e2a3d -s ours
Change-Id: I952a728c521909efc873b2050ffd98afc5fc4103
Bill Yi [Fri, 11 Nov 2016 19:18:58 +0000 (19:18 +0000)]
Import translations. DO NOT MERGE am:
f5ffd25c53 -s ours
am:
846acc7a07 -s ours
Change-Id: Id9a8158b8cb4cdb4e959717bff1cb899fa7477f0
TreeHugger Robot [Fri, 11 Nov 2016 19:18:06 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:17:46 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1741524a82 -s ours
am:
6a6db79a4c -s ours
Change-Id: I3e9d8e78708a11a28be6c177e0785d6a5b1af97a
Bill Yi [Fri, 11 Nov 2016 19:12:48 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
3bd78c2416 -s ours
am:
2f5e9c695c -s ours
Change-Id: I2e53af5616982fb5efd83e8c2804fe38506c15f4
Bill Yi [Fri, 11 Nov 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
8f278a7e06 -s ours
am:
f331a01a15 -s ours
Change-Id: I39e1c813b42a2f15c77f88a955a0c692363cbf37
Bill Yi [Fri, 11 Nov 2016 19:10:17 +0000 (19:10 +0000)]
Import translations. DO NOT MERGE am:
c51dd09193 -s ours
am:
0966a9085d -s ours
Change-Id: I6affa4a46e570fd94da1bd21b67ebe2dcc01ee40
TreeHugger Robot [Fri, 11 Nov 2016 19:09:35 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:09:02 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
47e6925d54 -s ours
am:
933403af15 -s ours
Change-Id: I386412764c908235063aac8dbcd23d8a911a0950
Bill Yi [Fri, 11 Nov 2016 19:07:55 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
1b9fbcf993 -s ours
am:
fd9d6dc79f -s ours
Change-Id: I9a760e75c93edd7b2c4a2affc8a455746edd9935
Bill Yi [Fri, 11 Nov 2016 19:03:03 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c6c0d901bf -s ours
Change-Id: I1e65c727225c0c7ff2dfa6b6c5a70b8b94290eee
Bill Yi [Fri, 11 Nov 2016 19:03:01 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
f5ffd25c53 -s ours
Change-Id: I775ecf81410882762047d8355d6aaea8dfff41e8
Bill Yi [Fri, 11 Nov 2016 19:01:25 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1741524a82 -s ours
Change-Id: I2340e89591f6c4f2f11a67493dcfff9c9ff15d42
Bill Yi [Fri, 11 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Import translations. DO NOT MERGE
am:
3bd78c2416 -s ours
Change-Id: I8838c95d0f6e688d70769939b2a4f5987fea5250
TreeHugger Robot [Fri, 11 Nov 2016 18:58:52 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 18:58:15 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
OSDN Git Service
