OSDN Git Service
Jakub Adamek [Fri, 21 Oct 2016 07:16:07 +0000 (07:16 +0000)]
Change name of overlay subdir 'sku'->'theme' am:
54dcaaba4f
am:
6bbb63ad91
Change-Id: I71dfaafbebaa7bd61d182405c734eef1ea7ff1eb
Jakub Adamek [Fri, 21 Oct 2016 07:05:17 +0000 (07:05 +0000)]
Change name of overlay subdir 'sku'->'theme'
am:
54dcaaba4f
Change-Id: I4536de644c20171e175cddaff0cd041fb05b3038
liulvping [Fri, 21 Oct 2016 04:58:43 +0000 (04:58 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938 am:
0046acc2db
am:
78b29d52e0
Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7
Brad Ebinger [Fri, 21 Oct 2016 04:55:19 +0000 (04:55 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours am:
ce21e3ffa8
am:
0fcc717ed9
Change-Id: I0d03c1dccfee9ffe7b8c6f44f6bdbfb876c11d21
Brad Ebinger [Fri, 21 Oct 2016 04:53:57 +0000 (04:53 +0000)]
Switch on android.telecom.Log in Telecom am:
ce97bfbdb2
am:
7ed42a72c0
Change-Id: I8adb58d243f2e674ec031584356496a754b21cf8
liulvping [Fri, 21 Oct 2016 04:46:50 +0000 (04:46 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938
am:
0046acc2db
Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
Brad Ebinger [Fri, 21 Oct 2016 04:45:47 +0000 (04:45 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours
am:
ce21e3ffa8
Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790
liulvping [Fri, 21 Oct 2016 04:38:38 +0000 (04:38 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am:
e6fe836938
Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
Brad Ebinger [Fri, 21 Oct 2016 04:37:28 +0000 (04:37 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
am:
37521b9ba5 -s ours
Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
Brad Ebinger [Fri, 21 Oct 2016 04:37:22 +0000 (04:37 +0000)]
Switch on android.telecom.Log in Telecom
am:
ce97bfbdb2
Change-Id: Ic7827f1627eca43937609e21d15186f483381182
Hugo Benichi [Fri, 21 Oct 2016 04:35:48 +0000 (04:35 +0000)]
Merge "IpConnectivity metrics: add version number"
Treehugger Robot [Fri, 21 Oct 2016 03:50:15 +0000 (03:50 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
TreeHugger Robot [Fri, 21 Oct 2016 03:04:10 +0000 (03:04 +0000)]
Merge "AAPT2: Fail compile on bad output file/dir"
TreeHugger Robot [Fri, 21 Oct 2016 02:48:55 +0000 (02:48 +0000)]
Merge "Check USB and Print Framework code."
liulvping [Thu, 20 Oct 2016 11:51:38 +0000 (19:51 +0800)]
fix mistaken check of mScreenBrightnessDarkConfig
Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
TreeHugger Robot [Fri, 21 Oct 2016 01:49:44 +0000 (01:49 +0000)]
Merge "ConnectivityManager: use ConnectivityThread looper"
Philip P. Moltmann [Fri, 21 Oct 2016 00:09:39 +0000 (17:09 -0700)]
Check USB and Print Framework code.
Test: Uploaded
Change-Id: Ib103a4fdc1dea0efc3a1a1be8c864541d283343a
Adam Lesinski [Fri, 21 Oct 2016 00:08:51 +0000 (17:08 -0700)]
AAPT2: Fail compile on bad output file/dir
Test: manual
Change-Id: I2578e32c52430a62df942822ddf6bd3f06357bce
TreeHugger Robot [Thu, 20 Oct 2016 23:58:13 +0000 (23:58 +0000)]
Merge "AAPT2: Error on uncompiled XML or PNG files in link phase"
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.
This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.
Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.
Test: ConnectivityServiceTest passes
Bug:
26749700
Bug:
28537383
Bug:
32130437
Change-Id: I431afcee7c7155bd7bac23a2e1e97fd5d6520c74
Hugo Benichi [Thu, 20 Oct 2016 23:49:01 +0000 (23:49 +0000)]
Merge "ConnectivityThread: use lazy holder idiom"
Hugo Benichi [Thu, 20 Oct 2016 23:46:28 +0000 (23:46 +0000)]
Merge "ConnectivityManager: a simpler CallbackHandler"
Jacky Cheung [Thu, 20 Oct 2016 23:20:57 +0000 (23:20 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." am:
6071abdb92 am:
046a5c3a00
am:
bd12e5c9db
Change-Id: Ic38340c15d1f2723c31d84acff12739acf8da3ff
Brad Ebinger [Wed, 5 Oct 2016 22:47:28 +0000 (15:47 -0700)]
Switch on android.telecom.Log in Telecom
Move over the Runnable Class into android.telecom and turn on the
framework's usage in Telecom.
CP from: https://android-review.googlesource.com/#/c/287291/
Test: All Telecom unit tests pass. Manual Log testing has also been
confirmed to be working as it did before.
Bug:
26571395
Change-Id: If7e2036c746c5a953f3a77e2d625a423ce5bf8f3
(cherry picked from commit
9fbbd4052dee1dfa74b87502cec91cc51170d69d)
Jacky Cheung [Thu, 20 Oct 2016 23:11:51 +0000 (23:11 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." am:
6071abdb92
am:
046a5c3a00
Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
Sergei Vasilinetc [Thu, 20 Oct 2016 23:05:02 +0000 (23:05 +0000)]
Merge "Pass Bitmap instead of SkBitmap for bitmap rect operation Test: refactoring cl. bug:
32216791"
Jacky Cheung [Thu, 20 Oct 2016 23:03:57 +0000 (23:03 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
am:
6071abdb92
Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
Brad Ebinger [Thu, 20 Oct 2016 22:53:38 +0000 (22:53 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
Treehugger Robot [Thu, 20 Oct 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
Winson [Thu, 20 Oct 2016 00:30:26 +0000 (17:30 -0700)]
Fixing issue with the pinned stack being cropped incorrectly.
- Pinned stacks were being treated as full screen tasks, and bounded
(incorrectly) to the display rect leading to negative insets. In
turn, this caused the view root to have negative insets, which caused
layout to be extended (width - (-inset)) when measured.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackOutOfBoundsInsetsNonNegative
Change-Id: I3339d982667c981a3c8ca56fb3542188de1d6714
Winson Chung [Thu, 20 Oct 2016 22:34:27 +0000 (22:34 +0000)]
Merge "Changing initial PIP bounds specifications."
Brad Ebinger [Thu, 20 Oct 2016 22:23:31 +0000 (22:23 +0000)]
Merge "Adds registerSessionListener API to Log" am:
e3daed81eb am:
b4ef12bba7
am:
4f28458250
Change-Id: Ic6118d1bc07fc7adeb9914d30c2107e604d669ef
Brad Ebinger [Thu, 20 Oct 2016 22:15:57 +0000 (22:15 +0000)]
Merge "Adds registerSessionListener API to Log" am:
e3daed81eb
am:
b4ef12bba7
Change-Id: I255d21923f45efcfc9d75057d42992dc58088e73
Brad Ebinger [Thu, 20 Oct 2016 22:09:30 +0000 (22:09 +0000)]
Merge "Adds registerSessionListener API to Log"
am:
e3daed81eb
Change-Id: Ia42cba6a735170ce1aea653bd42b6f1182853819
Agnieszka Madurska [Thu, 20 Oct 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev am:
faf09eaa40
am:
4768313c02
Change-Id: I3e37fab0d61244db77404f12f1da5e127f1ab0a0
Aga Madurska [Thu, 20 Oct 2016 22:04:28 +0000 (22:04 +0000)]
Add custom scrollbars to the default device theme am:
78a340f2b6
am:
9f47d20e57
Change-Id: Ia7531c574806cd241040bd9fdacae94c0c5d5b3b
Matthew Fritze [Thu, 20 Oct 2016 22:02:49 +0000 (22:02 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev am:
71ae440ac2 am:
46af871c00
am:
30678ec096
Change-Id: Ia02f949534ba1b194665e26a18eab79f7589eeba
Matthew Fritze [Thu, 20 Oct 2016 22:01:51 +0000 (22:01 +0000)]
Default for sending package name to support should be false am:
b68a83a8eb am:
4d9085f1d2
am:
6adcb1b33a
Change-Id: I79355e651feb9492a8bd21b1ed865e9d725df14d
Agnieszka Madurska [Thu, 20 Oct 2016 21:54:18 +0000 (21:54 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev
am:
faf09eaa40
Change-Id: Iaf21cc52a4c678be6bb31cfdeb64d79b8b8b32f5
Aga Madurska [Thu, 20 Oct 2016 21:54:11 +0000 (21:54 +0000)]
Add custom scrollbars to the default device theme
am:
78a340f2b6
Change-Id: I67f5e74259b5fa16bd647e7b7796d34a798ee175
Brad Ebinger [Thu, 20 Oct 2016 21:51:53 +0000 (21:51 +0000)]
Merge "Adds registerSessionListener API to Log"
Selim Gurun [Thu, 20 Oct 2016 21:47:36 +0000 (21:47 +0000)]
Merge "Update the documentation for onCreateInputConnection"
Adam Lesinski [Thu, 20 Oct 2016 21:38:23 +0000 (14:38 -0700)]
AAPT2: Error on uncompiled XML or PNG files in link phase
Incorrectly passing text XML and unprocessed PNG files to
the AAPT2 link phase should raise an error.
Test: manual incorrect invocation of aapt2
Change-Id: Iab47f99bc378b5d1c4f4d87098f08243b9a4dc6a
Jacky Cheung [Thu, 20 Oct 2016 21:40:20 +0000 (21:40 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev am:
8167362bab
am:
132263d8f9
Change-Id: Id48f048974d99570cb4d7df73c3cc2f110530f10
Agnieszka Madurska [Thu, 20 Oct 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev
Jacky Cheung [Thu, 20 Oct 2016 21:39:13 +0000 (21:39 +0000)]
Gradually increase the level of authentication on failed GATT operations. am:
84c6d339ee -s ours
am:
aeda8be7b2
Change-Id: Ifa2468c91a9d54f18be8cf51c91240ab1bf6ac5f
Matthew Fritze [Thu, 20 Oct 2016 21:36:26 +0000 (21:36 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev am:
71ae440ac2
am:
46af871c00
Change-Id: I92aa1053b8fefc36c617b3ad69af0af039fc6493
Shuzhen Wang [Thu, 20 Oct 2016 21:36:13 +0000 (21:36 +0000)]
Merge "Camera2: Add onCaptureQueueEmpty callback"
Matthew Fritze [Thu, 20 Oct 2016 21:35:14 +0000 (21:35 +0000)]
Default for sending package name to support should be false am:
b68a83a8eb
am:
4d9085f1d2
Change-Id: I10fb181b9aebc66bbbcaa646618f26ca84dfe552
Jacky Cheung [Thu, 20 Oct 2016 21:29:45 +0000 (21:29 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev
am:
8167362bab
Change-Id: I437b4df98f960426836536e96cdc33458162f649
Jacky Cheung [Thu, 20 Oct 2016 21:29:32 +0000 (21:29 +0000)]
Gradually increase the level of authentication on failed GATT operations.
am:
84c6d339ee -s ours
Change-Id: Icf50ddb340569c398d2820989083668a2c35c7f4
Matthew Fritze [Thu, 20 Oct 2016 21:16:24 +0000 (21:16 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev
am:
71ae440ac2
Change-Id: Idc18efe910dda8339e5fa7030e61b6172092f64a
Jason Monk [Thu, 20 Oct 2016 21:16:17 +0000 (21:16 +0000)]
Merge "Add nav gesture plugin interface"
Matthew Fritze [Thu, 20 Oct 2016 21:16:20 +0000 (21:16 +0000)]
Default for sending package name to support should be false
am:
b68a83a8eb
Change-Id: Ic30a1508a9f7a8b1592778fc7eaa44692e99e579
Matthew Fritze [Thu, 20 Oct 2016 21:05:06 +0000 (21:05 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev
sergeyv [Mon, 17 Oct 2016 20:07:38 +0000 (13:07 -0700)]
Pass Bitmap instead of SkBitmap for bitmap rect operation
Test: refactoring cl.
bug:
32216791
Change-Id: I66d19194c57b3aa2c400aa87acffc774a533776a
Jacky Cheung [Thu, 20 Oct 2016 20:55:21 +0000 (13:55 -0700)]
Gradually increase the level of authentication on failed GATT operations.
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.
Test: ported from internal branch.
Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86
Selim Gurun [Thu, 20 Oct 2016 18:53:14 +0000 (11:53 -0700)]
Update the documentation for onCreateInputConnection
Update the documentation to clarify that WebView calls methods of the
InputConnection on a separate thread than the UI thread. This is,
in some sense, similar to shouldInterceptRequest. The methods
that override InputConnection methods should be careful about thread
restrictions and concurrency when calling other methods or accessing
shared members.
Test: Document update. Verified manually.
Change-Id: Ida76cd5dcc683092c05947c3044d848d0a249547
Jacky Cheung [Thu, 20 Oct 2016 20:42:05 +0000 (20:42 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev
Calvin On [Thu, 20 Oct 2016 20:26:52 +0000 (20:26 +0000)]
Add option to skip and avoid captive portals. am:
4bc78eba6f
am:
4a048f9964
Change-Id: I530ccb95aa97100b27d71186173645031082acc1
Brad Ebinger [Thu, 20 Oct 2016 20:24:56 +0000 (20:24 +0000)]
Merge changes from topics 'logging_analytics_hooks', 'logging_switch'
* changes:
Adds registerSessionListener API to Log
Switch on android.telecom.Log in Telecom
Calvin On [Thu, 20 Oct 2016 20:18:10 +0000 (20:18 +0000)]
Add option to skip and avoid captive portals.
am:
4bc78eba6f
Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63
Android Build Merger (Role) [Thu, 20 Oct 2016 19:36:25 +0000 (19:36 +0000)]
Merge "Merge "Fix a static-analyzer warning." am:
63b4f6f5db am:
ea4423b181 am:
281e9f30c0"
Sergei Vasilinetc [Thu, 20 Oct 2016 19:35:57 +0000 (19:35 +0000)]
Merge "Pass Bitmap instead of SkBitmap in canvas.drawBitmap(Bitmap, float,float,Paint) Test: refactoring cl. bug:
32216791"
George Burgess IV [Thu, 20 Oct 2016 19:35:45 +0000 (19:35 +0000)]
Merge "Fix a static-analyzer warning." am:
63b4f6f5db am:
ea4423b181
am:
281e9f30c0
Change-Id: If34a4265ceb5bc6f4bf31c35e82270f90e970457
Sergei Vasilinetc [Thu, 20 Oct 2016 19:35:29 +0000 (19:35 +0000)]
Merge "Rename hwui/PixelRef to hwui/Bitmap Test: refactoring cl. bug:
32216791"
George Burgess IV [Thu, 20 Oct 2016 19:26:59 +0000 (19:26 +0000)]
Merge "Fix a static-analyzer warning." am:
63b4f6f5db
am:
ea4423b181
Change-Id: I47de526a03bed05c4f69a89ec3ed2403a7e3b536
George Burgess IV [Thu, 20 Oct 2016 19:19:15 +0000 (19:19 +0000)]
Merge "Fix a static-analyzer warning."
am:
63b4f6f5db
Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d
Treehugger Robot [Thu, 20 Oct 2016 19:06:58 +0000 (19:06 +0000)]
Merge "Fix a static-analyzer warning."
TreeHugger Robot [Thu, 20 Oct 2016 19:05:52 +0000 (19:05 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 20 Oct 2016 18:52:01 +0000 (18:52 +0000)]
Merge "Removed WindowState.getWindowList()"
Calvin On [Tue, 11 Oct 2016 22:10:46 +0000 (15:10 -0700)]
Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug:
30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit
be96da11ccb5dd500f920c3ba90d350857293b3d)
TreeHugger Robot [Thu, 20 Oct 2016 18:49:00 +0000 (18:49 +0000)]
Merge "Re-order draw methods to make update-api happy"
Jason Monk [Tue, 30 Aug 2016 18:09:21 +0000 (14:09 -0400)]
Add nav gesture plugin interface
Test: Manual
Change-Id: Ieb61a98cb1921358d41728bdbc7fb0c9c8fa46c1
Matthew Fritze [Thu, 20 Oct 2016 18:05:47 +0000 (11:05 -0700)]
Default for sending package name to support should be false
Change-Id: I2cc90cac2c2c72f9febb015487f8854ebf006aac
Fixes:
32303343
Test: manual
Jacky Cheung [Fri, 29 Jul 2016 18:49:27 +0000 (11:49 -0700)]
Gradually increase the level of authentication on failed GATT operations.
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.
Change-Id: I68335cf7451aeaf49c227d604f69cb329d117d08
Sudheer Shanka [Thu, 20 Oct 2016 17:55:03 +0000 (17:55 +0000)]
Merge "Move ApplicationThread to aidl."
Keun-young Park [Thu, 20 Oct 2016 17:24:09 +0000 (17:24 +0000)]
Merge "add default overlay for END_CALL_BEHAVIOR"
John Reck [Thu, 20 Oct 2016 16:49:46 +0000 (09:49 -0700)]
Re-order draw methods to make update-api happy
update-api orders methods alhabetically by name, but when
there's multiple methods with the same name it falls back to
the ordering within the file.
Re-order the methods in canvas.java to match what's already in
current.txt to avoid unnecessary changes.
Also auto-formatted the draw methods as some were mis-indented.
Test: No behavior change, just method re-ordering
Change-Id: I2a7d313c8e7a6bd9187c4ed7dbde944b88aa32bb
Winson [Thu, 13 Oct 2016 04:08:18 +0000 (21:08 -0700)]
Changing initial PIP bounds specifications.
- Change from a absolute bounds to a size, gravity and inset to
allow easier tweaking of initial pinned stack bounds.
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackDefaultBounds
Test: #testPinnedStackMovementBounds
Change-Id: I82a102bbd2d83259c6c84915071d1a16728e3aa7
sergeyv [Fri, 14 Oct 2016 23:30:21 +0000 (16:30 -0700)]
Pass Bitmap instead of SkBitmap in canvas.drawBitmap(Bitmap, float,float,Paint)
Test: refactoring cl.
bug:
32216791
Change-Id: If9f9fbc19e683b14cce6c3c268258bd832d495d2
sergeyv [Thu, 20 Oct 2016 01:47:26 +0000 (18:47 -0700)]
Rename hwui/PixelRef to hwui/Bitmap
Test: refactoring cl.
bug:
32216791
Change-Id: I26de43f71027bccb43a5011f84080ab4631b2883
Bill Yi [Thu, 20 Oct 2016 16:24:56 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
3623134476 -s ours am:
f9ca194dbe -s ours
am:
b56b616c1a -s ours
Change-Id: I7e18b80d8d64411e1783b63159452d8204f5906a
Bill Yi [Thu, 20 Oct 2016 16:23:57 +0000 (16:23 +0000)]
Import translations. DO NOT MERGE am:
66dc59064a -s ours am:
8236940965 -s ours
am:
d4c3c7dda2 -s ours
Change-Id: Iacaa47004f59d9f19d874ad889e491e4280b33e7
Bill Yi [Thu, 20 Oct 2016 16:22:58 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f7a7712d50 -s ours am:
4df6ac860e -s ours
am:
cbe06ade4a -s ours
Change-Id: I15e13340d4c033634fd762e328af70530d884017
Bill Yi [Thu, 20 Oct 2016 16:22:03 +0000 (16:22 +0000)]
Import translations. DO NOT MERGE am:
5ad7d6e328 -s ours am:
a3e34d4384 -s ours
am:
e92a8e80c8 -s ours
Change-Id: Ibd283450fb7216b350202eb0db4a99fabba4047c
Bill Yi [Thu, 20 Oct 2016 16:21:07 +0000 (16:21 +0000)]
Import translations. DO NOT MERGE am:
7f5b5eee99 -s ours am:
3aa778d239 -s ours
am:
d2a5fd0fee -s ours
Change-Id: If80ea8c0ed96003847c87c56105d0cada6af4e2b
Bill Yi [Thu, 20 Oct 2016 16:20:08 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0f62ca3a57 -s ours
am:
94944621b3 -s ours
Change-Id: Ie0ba85fc4e1782e604a69bbe5bd479d75ddb7af1
Bill Yi [Thu, 20 Oct 2016 16:19:03 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am:
59d5ed7768 -s ours
am:
8eb2c31c42 -s ours
Change-Id: I8c0d4ba263db6a26c1b4d9e5cd6934c2411da918
Bill Yi [Thu, 20 Oct 2016 16:18:08 +0000 (16:18 +0000)]
Import translations. DO NOT MERGE am:
0de1d97546 -s ours
am:
3e8d6d5dd6 -s ours
Change-Id: I843a82c6586efb1e89158834edc7ce8b1bd55f3d
Bill Yi [Thu, 20 Oct 2016 16:11:52 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
3623134476 -s ours
am:
f9ca194dbe -s ours
Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5
Bill Yi [Thu, 20 Oct 2016 16:11:03 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE am:
66dc59064a -s ours
am:
8236940965 -s ours
Change-Id: I7eca255c8bbd3a70e2b18f75080e33c9be9ac061
TreeHugger Robot [Thu, 20 Oct 2016 16:10:12 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 20 Oct 2016 16:10:05 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f7a7712d50 -s ours
am:
4df6ac860e -s ours
Change-Id: I8d43798266a46cfe198314e80af52042fe4c1ade
Bill Yi [Thu, 20 Oct 2016 16:09:13 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am:
5ad7d6e328 -s ours
am:
a3e34d4384 -s ours
Change-Id: I4b6b7b363fc8e7a5fb4610bd650928acdfda5763
Bill Yi [Thu, 20 Oct 2016 16:05:27 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE am:
7f5b5eee99 -s ours
am:
3aa778d239 -s ours
Change-Id: Idaf4afb7a5b9d94bdc46ac765781ffa23f79e337
Bill Yi [Thu, 20 Oct 2016 16:03:58 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
3623134476 -s ours
Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3
Bill Yi [Thu, 20 Oct 2016 16:03:56 +0000 (16:03 +0000)]
Import translations. DO NOT MERGE
am:
66dc59064a -s ours
Change-Id: Ic64d34c0cc499094b3e43789ed9f28f45801b8cd
Bill Yi [Thu, 20 Oct 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0f62ca3a57 -s ours
Change-Id: Ic7f85082337cee707f4166508ae49986471a925f
Bill Yi [Thu, 20 Oct 2016 16:03:49 +0000 (16:03 +0000)]
Import translations. DO NOT MERGE
am:
59d5ed7768 -s ours
Change-Id: I12da8ae4edd14a2a4efd554c6f8d5f91bb180945
OSDN Git Service
