OSDN Git Service
Siyamed Sinir [Tue, 8 Nov 2016 00:57:33 +0000 (00:57 +0000)]
Merge "TextLine.handleRun should throw exception for invalid index"
Siyamed Sinir [Tue, 8 Nov 2016 00:56:14 +0000 (00:56 +0000)]
Merge "StaticLayout visual fix for maxLines"
Jeff Sharkey [Tue, 8 Nov 2016 00:38:42 +0000 (00:38 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88 am:
930e77314b am:
8c73d7989f am:
299aa88e26 am:
568e46ebe1
am:
473d807d05
Change-Id: I5c4997dec1b966afdaf7c5287a059e826b4da135
Jeff Sharkey [Tue, 8 Nov 2016 00:36:38 +0000 (00:36 +0000)]
Public volumes belong to a single user. am:
6566fbe99b am:
50cc6c111c am:
0b28736f03 am:
8b2091ea94 am:
ce90c7aa30
am:
f719a314a6
Change-Id: I0c3e8eba220729e7125876db55fc55368bae6f7d
Jeff Sharkey [Tue, 8 Nov 2016 00:34:21 +0000 (00:34 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev am:
0f35d29a7e am:
83287ac02c am:
0d206a20f7
am:
bbead2204e
Change-Id: I801135a08378fc99b93ddd8b5b3aef9ccb8086ee
Jeff Sharkey [Tue, 8 Nov 2016 00:29:19 +0000 (00:29 +0000)]
Public volumes belong to a single user. am:
8b38d083c4 am:
f91147036f am:
9d2187c6f8
am:
73dcf0a849
Change-Id: I1c8ed8d4c03e3d2adc18e9e87f2dd79fa2a0ef25
Jeff Sharkey [Tue, 8 Nov 2016 00:20:21 +0000 (00:20 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88 am:
930e77314b am:
8c73d7989f am:
299aa88e26
am:
568e46ebe1
Change-Id: I0de9d20107d1733588c122b24cb684eae26f957a
Jeff Sharkey [Tue, 8 Nov 2016 00:18:50 +0000 (00:18 +0000)]
Public volumes belong to a single user. am:
6566fbe99b am:
50cc6c111c am:
0b28736f03 am:
8b2091ea94
am:
ce90c7aa30
Change-Id: I56eb70838b18273cc05f62d167789257ab95dcd8
Jeff Sharkey [Tue, 8 Nov 2016 00:16:51 +0000 (00:16 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev am:
0f35d29a7e am:
83287ac02c
am:
0d206a20f7
Change-Id: I1928faff8e13b43899de81b1fc17fe759115311e
Jeff Sharkey [Tue, 8 Nov 2016 00:14:39 +0000 (00:14 +0000)]
Public volumes belong to a single user. am:
8b38d083c4 am:
f91147036f
am:
9d2187c6f8
Change-Id: I7359fc9ccd9399abf23da15359d410c073cbb370
Jeff Sharkey [Tue, 8 Nov 2016 00:08:33 +0000 (00:08 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88 am:
930e77314b am:
8c73d7989f
am:
299aa88e26
Change-Id: I133cdcd293ca15a2b9e5ee1e3d36f881e710c3ed
Jeff Sharkey [Tue, 8 Nov 2016 00:06:59 +0000 (00:06 +0000)]
Public volumes belong to a single user. am:
6566fbe99b am:
50cc6c111c am:
0b28736f03
am:
8b2091ea94
Change-Id: Ife8911bb4e970654a3759448bd9a58d158012750
Jeff Sharkey [Tue, 8 Nov 2016 00:06:08 +0000 (00:06 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev am:
0f35d29a7e
am:
83287ac02c
Change-Id: If37daa325d71d86a231afb617c4b780e74a9de16
Jeff Sharkey [Tue, 8 Nov 2016 00:04:38 +0000 (00:04 +0000)]
Public volumes belong to a single user. am:
8b38d083c4
am:
f91147036f
Change-Id: Idf89bd6bda908ed50fad583f93c4f3c4aa783729
Jeff Sharkey [Mon, 7 Nov 2016 23:59:18 +0000 (23:59 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88 am:
930e77314b
am:
8c73d7989f
Change-Id: Iae899873091306c2e86e184187bea695a1b928bc
Jeff Sharkey [Mon, 7 Nov 2016 23:57:38 +0000 (23:57 +0000)]
Public volumes belong to a single user. am:
6566fbe99b am:
50cc6c111c
am:
0b28736f03
Change-Id: I3f00c1c9a48d064d759e7c3727c4f40c732aa9da
Jeff Sharkey [Mon, 7 Nov 2016 23:54:57 +0000 (23:54 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev
am:
0f35d29a7e
Change-Id: I6948a2b174ab8a328fdedf80f0adc564aec93e60
Jeff Sharkey [Mon, 7 Nov 2016 23:54:51 +0000 (23:54 +0000)]
Public volumes belong to a single user.
am:
8b38d083c4
Change-Id: I659a2bb47472c71a7248ccb54281073a24e8a19d
Etan Cohen [Mon, 7 Nov 2016 23:54:45 +0000 (23:54 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API" am:
13c76b77dc am:
60e6734100 am:
5f9b3d834b
am:
2a9cc83dee
Change-Id: I2df8122823b811c2418f8d5e583933632fa7b818
Jeff Sharkey [Mon, 7 Nov 2016 23:51:20 +0000 (23:51 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88
am:
930e77314b
Change-Id: I0dfbf6667e2a8c9f696274aaca08124b6a41d378
Etan Cohen [Mon, 7 Nov 2016 23:50:07 +0000 (23:50 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API" am:
13c76b77dc am:
60e6734100
am:
5f9b3d834b
Change-Id: I50b5ef421fcaf8d7ec83bb00024f048dcd5378c0
Jeff Sharkey [Mon, 7 Nov 2016 23:50:07 +0000 (23:50 +0000)]
Public volumes belong to a single user. am:
6566fbe99b
am:
50cc6c111c
Change-Id: Id8b1fa49f1b2ebef27c0e9f81486c6964781fb68
TreeHugger Robot [Mon, 7 Nov 2016 23:45:19 +0000 (23:45 +0000)]
Merge "Remove fAsset->read() debug statement"
Jeff Sharkey [Mon, 7 Nov 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:43:18 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
am:
d537f76b88
Change-Id: I6d76d35678d3a1cbbab3fe0290540fa5fe3c80ad
Jeff Sharkey [Mon, 7 Nov 2016 23:43:14 +0000 (23:43 +0000)]
Public volumes belong to a single user.
am:
6566fbe99b
Change-Id: If636376b98c449aee3794259317e39a3f0f7f163
Etan Cohen [Mon, 7 Nov 2016 23:40:35 +0000 (23:40 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API" am:
13c76b77dc
am:
60e6734100
Change-Id: I6e2b1496d2868787d7173ed239f8b6b6081b0d99
Etan Cohen [Mon, 7 Nov 2016 23:35:37 +0000 (23:35 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API"
am:
13c76b77dc
Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
Jeff Sharkey [Mon, 7 Nov 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
Etan Cohen [Mon, 7 Nov 2016 23:19:01 +0000 (23:19 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API"
Hemal Patel [Mon, 7 Nov 2016 23:04:47 +0000 (23:04 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1 am:
4da8fdaa15 am:
25cba2de54 am:
314131182d am:
5d86219ed8
am:
449f53c52a
Change-Id: Ibd356b5b854db15b2e624dba0ad01680fe7287b3
Hemal Patel [Mon, 7 Nov 2016 23:03:25 +0000 (23:03 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4 am:
32bda49ae3 am:
618d339f3c am:
972fed3d41 am:
3fb153b196
am:
6a263b9faf
Change-Id: I9a246348630e85edeac441b310326f5c216585e9
Hemal Patel [Mon, 7 Nov 2016 22:53:45 +0000 (22:53 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1 am:
4da8fdaa15 am:
25cba2de54 am:
314131182d
am:
5d86219ed8
Change-Id: If8f85d5bffb90243e635d64c9379a695d7ae15ac
Hemal Patel [Mon, 7 Nov 2016 22:52:37 +0000 (22:52 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4 am:
32bda49ae3 am:
618d339f3c am:
972fed3d41
am:
3fb153b196
Change-Id: Ia04ece98157476b62aed61766c2b0bdb5978a592
Hemal Patel [Mon, 7 Nov 2016 22:43:20 +0000 (22:43 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1 am:
4da8fdaa15 am:
25cba2de54
am:
314131182d
Change-Id: If09f84d26df52e3d391fc77933e945074ace9ab9
Hemal Patel [Mon, 7 Nov 2016 22:42:09 +0000 (22:42 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4 am:
32bda49ae3 am:
618d339f3c
am:
972fed3d41
Change-Id: I246f6ad12e75aca16d952ab790af316913537cfd
Jason Monk [Mon, 7 Nov 2016 22:41:52 +0000 (22:41 +0000)]
Merge "Don't include the example plugin in mk"
Hemal Patel [Mon, 7 Nov 2016 22:32:03 +0000 (22:32 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1 am:
4da8fdaa15
am:
25cba2de54
Change-Id: If60b26c74033350e7d103c69fa0d33f67ac08f63
Hemal Patel [Mon, 7 Nov 2016 22:31:01 +0000 (22:31 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4 am:
32bda49ae3
am:
618d339f3c
Change-Id: I68f8105a901685cf2382dae2982be846746565c2
Hemal Patel [Mon, 7 Nov 2016 22:22:06 +0000 (22:22 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1
am:
4da8fdaa15
Change-Id: I9596ce508e799a82c8224bb5e33d30c8de94311b
Hemal Patel [Mon, 7 Nov 2016 22:21:07 +0000 (22:21 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4
am:
32bda49ae3
Change-Id: I811bb218f83087c5dd602b4382c7496e019dcb0b
TreeHugger Robot [Mon, 7 Nov 2016 22:16:58 +0000 (22:16 +0000)]
Merge "Doze: Refactor v1"
Adrian Roos [Thu, 3 Nov 2016 19:13:36 +0000 (12:13 -0700)]
Doze: Refactor v1
Pulls appart UI, state, power, display and trigger management
into individual components controlled by a state machine.
Also adds tests.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Change-Id: I6ee7e79d58a5a3ebeb975775af44ad1e5aaccf93
Hemal Patel [Mon, 7 Nov 2016 22:11:06 +0000 (22:11 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
am:
80956c99b1
Change-Id: I9a030b5080f7c1abe9a9e00404a7b72979e27aec
Hemal Patel [Mon, 7 Nov 2016 22:10:59 +0000 (22:10 +0000)]
Docs: Revised the Drawable example
am:
ad302b60f4
Change-Id: I3504dde2e7a31a50c59e3be239ae0160f84435ef
Hemal Patel [Mon, 7 Nov 2016 21:57:46 +0000 (21:57 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
TreeHugger Robot [Mon, 7 Nov 2016 21:48:42 +0000 (21:48 +0000)]
Merge "Add safety net if StackView duration would be negative."
TreeHugger Robot [Mon, 7 Nov 2016 21:32:25 +0000 (21:32 +0000)]
Merge "Fix bug with displaying visual profile bars"
Matt Sarett [Mon, 7 Nov 2016 20:53:46 +0000 (15:53 -0500)]
Remove fAsset->read() debug statement
This shows up in the Skia logs constantly and does
not provide useful information.
Test: This no longer prints.
BUG:
32370375
Change-Id: Ic8308d41826cb27de77b019fdc59e434086c8009
Derek Sollenberger [Mon, 7 Nov 2016 20:59:44 +0000 (20:59 +0000)]
Merge "Refactor pin/unpinImages to work across pipelines."
Derek Sollenberger [Mon, 7 Nov 2016 20:42:34 +0000 (20:42 +0000)]
Merge "Enable SkiaPipelines to interoperate with existing GlesDriver configs."
Rob Carr [Mon, 7 Nov 2016 20:24:48 +0000 (20:24 +0000)]
Merge "Tests for computeFrameLw docked type scenarios."
Jorim Jaggi [Mon, 7 Nov 2016 20:04:03 +0000 (20:04 +0000)]
Merge "Fix waitingForDrawn callback not called when adjusting for IME" into nyc-mr2-dev am:
26ce8ba803
am:
5f5b007352
Change-Id: I4509a6a4a5c2880a5a48e42a8442a2f298ad8cb8
Jorim Jaggi [Mon, 7 Nov 2016 20:02:29 +0000 (20:02 +0000)]
Fix waitingForDrawn callback not called when adjusting for IME am:
3188386ff8
am:
b2089aba28
Change-Id: I4381e9828e37d0e939390ee24da3395059a30e9a
Jorim Jaggi [Mon, 7 Nov 2016 19:52:34 +0000 (19:52 +0000)]
Merge "Fix waitingForDrawn callback not called when adjusting for IME" into nyc-mr2-dev
am:
26ce8ba803
Change-Id: I1d29ec289954e8cec337bb8235815f2e362f644d
Jorim Jaggi [Mon, 7 Nov 2016 19:52:28 +0000 (19:52 +0000)]
Fix waitingForDrawn callback not called when adjusting for IME
am:
3188386ff8
Change-Id: I6c844d1b86836673329a198b0f1d97bd07ff22f3
TreeHugger Robot [Mon, 7 Nov 2016 19:41:03 +0000 (19:41 +0000)]
Merge "thermal: add usage of IThermal."
Jorim Jaggi [Mon, 7 Nov 2016 19:40:22 +0000 (19:40 +0000)]
Merge "Fix waitingForDrawn callback not called when adjusting for IME" into nyc-mr2-dev
Matt Sarett [Mon, 7 Nov 2016 19:23:12 +0000 (14:23 -0500)]
Fix bug with displaying visual profile bars
Test: Used debugging feature.
BUG:
32370375
Change-Id: I56e4e2155566a219ce43882e48b327123edccfe2
Julius D'souza [Mon, 7 Nov 2016 18:52:05 +0000 (18:52 +0000)]
Merge "Add initial ambient light sensor rate"
Sohani Rao [Mon, 7 Nov 2016 18:43:22 +0000 (18:43 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
Tony Wickham [Mon, 7 Nov 2016 18:18:55 +0000 (10:18 -0800)]
Add safety net if StackView duration would be negative.
Bug:
32699754
Change-Id: I00d4b2398fa7f4ab4cdad290a346b0f09c2af242
Dianne Hackborn [Mon, 7 Nov 2016 18:23:37 +0000 (18:23 +0000)]
Merge "Implement system API for monitoring uid importance changes."
Eric Laurent [Mon, 7 Nov 2016 18:19:07 +0000 (18:19 +0000)]
Merge "AudioService: fix mismatch in device volume index for alias streams"
Marco Nelissen [Mon, 7 Nov 2016 18:00:06 +0000 (18:00 +0000)]
Merge "Use libaudioclient" am:
0a05c49248 am:
1d10b88f40 am:
e327563c6c
am:
694d1b5764 -s ours
Change-Id: I808bf0d575a3b6a8088fd03fa8fcb43f7084602f
Marco Nelissen [Mon, 7 Nov 2016 17:41:27 +0000 (17:41 +0000)]
Merge "Use libaudioclient" am:
0a05c49248 am:
1d10b88f40
am:
e327563c6c
Change-Id: I5a1868ae472821dbd3f29e342f7410f8adcb37d8
Marco Nelissen [Mon, 7 Nov 2016 17:31:52 +0000 (17:31 +0000)]
Merge "Use libaudioclient" am:
0a05c49248
am:
1d10b88f40
Change-Id: I55ad06914aae308f7ffa46c27b9bab3db46cdc1c
Marco Nelissen [Mon, 7 Nov 2016 17:22:36 +0000 (17:22 +0000)]
Merge "Use libaudioclient"
am:
0a05c49248
Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
Etan Cohen [Mon, 7 Nov 2016 17:14:46 +0000 (09:14 -0800)]
[AWARE] Fix visibility of Aware Characteristics API
Hide the get characteristics API - since the underlying characteristics
class is (still hidden). Will be opened in a separate phase from the parent
class.
Bug:
31912101
Test: update-api succeeded when opening the parent class
Change-Id: Ibe2f282027cd4b1c03bfb2b1e151551c34314541
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Use libaudioclient"
Derek Sollenberger [Mon, 7 Nov 2016 15:57:59 +0000 (10:57 -0500)]
Enable SkiaPipelines to interoperate with existing GlesDriver configs.
Test: hwui unit tests
Change-Id: Icd94d0e21130d86fb5514801f999d0018a69e151
Polina Bondarenko [Tue, 11 Oct 2016 16:44:12 +0000 (18:44 +0200)]
thermal: add usage of IThermal.
HardwarePropertiesManagerService native impl uses IThermal instead of
thermal_module.
Bug:
32022261
Test: CTS
Change-Id: I85e5c5bedb1cb6762207ccfa3e3a7dd4c00ee30a
Derek Sollenberger [Fri, 4 Nov 2016 14:46:18 +0000 (10:46 -0400)]
Refactor pin/unpinImages to work across pipelines.
Test: existing CTS tests still pass
Change-Id: Ib2607e9853396bad42f298829b5c5da0d210af32
Torne (Richard Coles) [Fri, 23 Sep 2016 15:41:42 +0000 (16:41 +0100)]
Add the webview zygote socket to the zygote whitelist.
Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.
Test: WebView functions correctly with multiprocess dev setting enabled
Bug:
21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333
TreeHugger Robot [Mon, 7 Nov 2016 06:21:43 +0000 (06:21 +0000)]
Merge "Not create document under the device."
Seigo Nonaka [Mon, 7 Nov 2016 05:22:48 +0000 (05:22 +0000)]
Merge "Make sure the Typeface is loaded before calling measureText."
Hugo Benichi [Mon, 7 Nov 2016 04:07:09 +0000 (04:07 +0000)]
Merge "Netd events: record connect() success/errno"
Daichi Hirono [Wed, 2 Nov 2016 05:51:26 +0000 (14:51 +0900)]
Not create document under the device.
The structure of files in MtpDocumentsProvider looks like
/device/storage/files. But MtpDocumentsProvider shows files
just under the device if the device has only single storage.
It causes a problem that MtpDocumentsProvider tries to create a file
under the device. Previously it tries to create a file with storageId =
0, which means MTP device choose a storage to store the file.
Because it only happens when the device has a single storage, the file
is properly written to the device. But the database in
MtpDocumentsProvider goes into the illegal state where the file is
placed just under the device.
Bug:
32561572
Test: adb shell am instrument -w -e class com.android.mtp.MtpDocumentsProviderTest com.android.mtp.tests/com.android.mtp.TestResultInstrumentation
Change-Id: I47a373ceee8a64ba9995934317693e79d2497ee0
Hugo Benichi [Mon, 7 Nov 2016 00:09:52 +0000 (00:09 +0000)]
Merge "frameworks-test: adding missing @SmallTest"
Etan Cohen [Sun, 6 Nov 2016 03:38:18 +0000 (03:38 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
74b1131cc8 am:
6571007101 am:
a99a05982e
am:
2ad6b14d50 -s ours
Change-Id: Id51e99533ce8ab29bd40170f8eafc0f9702c16fb
Etan Cohen [Sun, 6 Nov 2016 03:29:40 +0000 (03:29 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
74b1131cc8 am:
6571007101
am:
a99a05982e
Change-Id: I8df580e15770c54ab3f0da3e3ff97165939719df
Etan Cohen [Sun, 6 Nov 2016 03:21:37 +0000 (03:21 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware" am:
74b1131cc8
am:
6571007101
Change-Id: Ief54b313dc5ca5d30645b55ed2ad0333036a1671
Etan Cohen [Sun, 6 Nov 2016 03:13:31 +0000 (03:13 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
am:
74b1131cc8
Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Wed, 26 Oct 2016 18:22:06 +0000 (11:22 -0700)]
[NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!
Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.
(cherry-pick of commit
a61b9fb569153917a650f1d48efa20ba8846a9f3)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
Etan Cohen [Sat, 5 Nov 2016 16:19:39 +0000 (16:19 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Bill Yi [Sat, 5 Nov 2016 06:51:30 +0000 (06:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
42f6ca6097 -s ours
am:
cc65f0761d -s ours
Change-Id: I78fefb7537855d2054c44f6fc5f4505b5eb00027
Bill Yi [Sat, 5 Nov 2016 06:50:41 +0000 (06:50 +0000)]
Import translations. DO NOT MERGE am:
6b7911ae4c -s ours
am:
239809dea8 -s ours
Change-Id: I3bc6484686f6c5245c8e7008b0bb09b362967aa4
Bill Yi [Sat, 5 Nov 2016 06:49:49 +0000 (06:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
1b93d5c5a1 -s ours
am:
8e4618bca6 -s ours
Change-Id: Ibfdf60ceeade0025ec643e04bf675cca752f5990
Bill Yi [Sat, 5 Nov 2016 06:48:58 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE am:
a5753cef6e -s ours
am:
98d19da3d7 -s ours
Change-Id: I7ee5826dc0ee95155afbb3546adb5af10c896c77
Bill Yi [Sat, 5 Nov 2016 06:47:55 +0000 (06:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b14995516a -s ours
am:
9fbeb40fc9 -s ours
Change-Id: If318447c1a74e2bf80522b2e866e4bf3b7c7c667
Bill Yi [Sat, 5 Nov 2016 06:47:04 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE am:
4d67c3b986 -s ours
am:
34485976f4 -s ours
Change-Id: I468134a01d8c75388ef264b074d8e7337e79b42d
Bill Yi [Sat, 5 Nov 2016 06:46:11 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
86875e592a -s ours
am:
fbe8eef154 -s ours
Change-Id: Ic8550bb43ae2e9eaf74e10d8d1976bbb39876176
Bill Yi [Sat, 5 Nov 2016 06:45:22 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE am:
d6a229b64c -s ours
am:
77cf704647 -s ours
Change-Id: Ibad84fdc51f710ae592e9592c74ae9eb4c96499b
Bill Yi [Sat, 5 Nov 2016 06:44:31 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
53c2954e4e -s ours
am:
8d518cac98 -s ours
Change-Id: I9dd822ec13d9ebb3933e1ea0b6a5c9f72700c569
Bill Yi [Sat, 5 Nov 2016 06:43:41 +0000 (06:43 +0000)]
Import translations. DO NOT MERGE am:
92ba705e9f -s ours
am:
c7bfce0dda -s ours
Change-Id: Ie216dd1aaa6f188cf137c3d4d5fb6d83da0544cb
Bill Yi [Sat, 5 Nov 2016 06:42:50 +0000 (06:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
dfe1833475 -s ours
am:
e8dff1a5bd -s ours
Change-Id: I7afd465a8c51b43936a6c3efec210564f06db49d
Bill Yi [Sat, 5 Nov 2016 06:41:59 +0000 (06:41 +0000)]
Import translations. DO NOT MERGE am:
66333161bb -s ours
am:
77b50cef75 -s ours
Change-Id: Ie77db5506e553ab6280babbccb8aabf8bbd27cb7
Bill Yi [Sat, 5 Nov 2016 06:36:57 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b26e27dc4a -s ours
am:
f6e16b8604 -s ours
Change-Id: Idc09dc274841228ccce97d9613438df2fa210ec7
Bill Yi [Sat, 5 Nov 2016 06:36:04 +0000 (06:36 +0000)]
Import translations. DO NOT MERGE am:
0c1f10dd0c -s ours
am:
eff51c8add -s ours
Change-Id: Ie3011999ec010370e5419520c225390132fa5b02
OSDN Git Service
