OSDN Git Service
Julius D'souza [Sat, 22 Oct 2016 04:04:22 +0000 (04:04 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
am:
4fff94f1ed
Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc
Robert Sesek [Sat, 22 Oct 2016 03:17:15 +0000 (03:17 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit." am:
8be2850546
am:
f80fab010a
Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
Robert Sesek [Sat, 22 Oct 2016 03:12:18 +0000 (03:12 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am:
8be2850546
Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
Treehugger Robot [Sat, 22 Oct 2016 03:03:10 +0000 (03:03 +0000)]
Merge "Create the WebViewZygote and implement WebViewZygoteInit."
Jason Monk [Sat, 22 Oct 2016 02:37:21 +0000 (02:37 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev am:
9db47b0f49
am:
e28705ac90
Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78
Jason Monk [Sat, 22 Oct 2016 02:36:16 +0000 (02:36 +0000)]
Fix vpn branded string usage am:
59474a40af
am:
ec421cd433
Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
Jason Monk [Sat, 22 Oct 2016 02:30:53 +0000 (02:30 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
am:
9db47b0f49
Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
Jason Monk [Sat, 22 Oct 2016 02:30:51 +0000 (02:30 +0000)]
Fix vpn branded string usage
am:
59474a40af
Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev
Julius D'souza [Sat, 22 Oct 2016 02:21:01 +0000 (02:21 +0000)]
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
This reverts commit
637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.
Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
Jeremy Joslin [Fri, 21 Oct 2016 23:43:06 +0000 (23:43 +0000)]
VPN network stat accounting changes. am:
3f0d75afe8
am:
0d309b7a47
Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
Jeremy Joslin [Fri, 21 Oct 2016 23:37:57 +0000 (23:37 +0000)]
VPN network stat accounting changes.
am:
3f0d75afe8
Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes:
32071681
Julius D'souza [Fri, 21 Oct 2016 22:37:04 +0000 (22:37 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am:
a39e64eac2
Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
Julius D'souza [Fri, 21 Oct 2016 22:36:58 +0000 (22:36 +0000)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
am:
637ae798cc
Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d
Julius D'souza [Fri, 21 Oct 2016 22:29:33 +0000 (22:29 +0000)]
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
Julius D'souza [Fri, 21 Oct 2016 21:06:28 +0000 (14:06 -0700)]
DO NOT MERGE: Disable dim brightness reset when using ALS-based doze
Bug:
32169300
Change-Id: I60d23405eb38ec0625b5b7f739a84918f4632359
Android Build Merger (Role) [Fri, 21 Oct 2016 21:19:31 +0000 (21:19 +0000)]
Merge "Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41 am:
50f9b6e71f" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Fri, 21 Oct 2016 21:18:48 +0000 (21:18 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error" am:
03f14bef41
am:
50f9b6e71f
Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
Vinod Krishnan [Fri, 21 Oct 2016 21:17:48 +0000 (21:17 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
am:
088f73a9e9
Change-Id: Icbea8fbdefbf9979b72b7babac10e28a336d7d2f
Vinod Krishnan [Fri, 21 Oct 2016 21:14:19 +0000 (21:14 +0000)]
Fwk: Only chime when docked and accessbility is on
am:
cf11ceab65
Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
Michael Kwan [Fri, 21 Oct 2016 21:11:25 +0000 (21:11 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
am:
243e966892
Change-Id: I9f3ae90d6ecce4c2944faad3f6f9b95642469935
Michael Kwan [Fri, 21 Oct 2016 21:11:17 +0000 (21:11 +0000)]
Fix improperly laid out alert dialog title to match UX specs.
am:
9c86e68bfa
Change-Id: I0989366635ebeb4af6ca63cc42c50913c2b7d32a
Yin-Chia Yeh [Fri, 21 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
am:
03f14bef41
Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
TreeHugger Robot [Fri, 21 Oct 2016 20:41:07 +0000 (20:41 +0000)]
Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev
Michael Kwan [Fri, 21 Oct 2016 20:38:02 +0000 (20:38 +0000)]
Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev
Treehugger Robot [Fri, 21 Oct 2016 20:36:29 +0000 (20:36 +0000)]
Merge "Camera2 Legacy: catch more surface abandoned error"
Yin-Chia Yeh [Wed, 19 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Camera2 Legacy: catch more surface abandoned error
Bug:
30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
Erik Wolsheimer [Fri, 21 Oct 2016 17:37:05 +0000 (17:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am:
653b982d18 -s ours
Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d
Erik Wolsheimer [Fri, 21 Oct 2016 17:36:58 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
am:
b608d28f84 -s ours
Change-Id: Ic3d70afc2f07ee8ae3e09fbb0e010daebb199f21
Mathieu Chartier [Fri, 21 Oct 2016 17:28:55 +0000 (17:28 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1
am:
bb08c03048
Change-Id: I24dc9ea087f76ebb2130a4d4957f0600e189aed3
Vinod Krishnan [Fri, 21 Oct 2016 05:57:02 +0000 (22:57 -0700)]
Fwk: Only chime when docked and accessbility is on
Bug:
32036947
Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
TreeHugger Robot [Fri, 21 Oct 2016 17:23:42 +0000 (17:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
Mathieu Chartier [Fri, 21 Oct 2016 17:20:27 +0000 (17:20 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
am:
4a5789b9b1
Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
Mathieu Chartier [Fri, 21 Oct 2016 17:07:37 +0000 (17:07 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
BUG:
32172459
BUG:
32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
Jakub Adamek [Fri, 21 Oct 2016 09:27:35 +0000 (09:27 +0000)]
Add new color: accent with 60% opacity.
am:
4f8b640bb7
Change-Id: I59d23f030b6413f5cf3899d4a6b0daea7ff271c7
Jakub Adamek [Thu, 20 Oct 2016 08:45:38 +0000 (09:45 +0100)]
Add new color: accent with 60% opacity.
Bug:
32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
Jakub Adámek [Fri, 21 Oct 2016 07:58:34 +0000 (07:58 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
am:
42f40b159f
Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b
Jakub Adamek [Fri, 21 Oct 2016 07:58:26 +0000 (07:58 +0000)]
Fix idmap calls when a subdir is present.
am:
56b9987ed7
Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0
Jakub Adámek [Fri, 21 Oct 2016 07:51:17 +0000 (07:51 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
Jakub Adamek [Thu, 20 Oct 2016 14:07:57 +0000 (15:07 +0100)]
Fix idmap calls when a subdir is present.
We need to increase the size of argv so that the last one remains
a NULL.
Bug:
32202741
Change-Id: I6636b5401fa7a61686a48c9a99b3e54e596033f9
Flavio Lerda [Fri, 21 Oct 2016 07:09:27 +0000 (07:09 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
am:
327dbfb94f
Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64
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
Flavio Lerda [Fri, 21 Oct 2016 06:32:18 +0000 (06:32 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
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
Treehugger Robot [Fri, 21 Oct 2016 03:50:15 +0000 (03:50 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
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>
Michael Kwan [Fri, 21 Oct 2016 01:36:09 +0000 (18:36 -0700)]
Fix improperly laid out alert dialog title to match UX specs.
Test: visual inspect using ApiDemos
Bug:
32315229
Change-Id: I486edc94c077af49e1235519e158e55833796231
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
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."
Mathieu Chartier [Thu, 20 Oct 2016 22:38:55 +0000 (15:38 -0700)]
Fix accounting for .vdex in dumpsys meminfo
Before it was showing up in "Other mmap" instead. Now it is correctly
showing up in ".dex mmap".
Bug:
30937355
Test: N6P booting, dumpsys meminfo -d
Change-Id: I335dbb77414b395b14259aa7c68068f845a5eca1
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 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"
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
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
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
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
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
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:18:10 +0000 (20:18 +0000)]
Add option to skip and avoid captive portals.
am:
4bc78eba6f
Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63
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."
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)
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
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
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
Bill Yi [Thu, 20 Oct 2016 16:02:34 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f7a7712d50 -s ours
Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a
Bill Yi [Thu, 20 Oct 2016 16:02:32 +0000 (16:02 +0000)]
Import translations. DO NOT MERGE
am:
5ad7d6e328 -s ours
Change-Id: I6b1a80f5cbc2282afe50101e2a6fdc3b7c17db52
Bill Yi [Thu, 20 Oct 2016 16:02:31 +0000 (16:02 +0000)]
Import translations. DO NOT MERGE
am:
0de1d97546 -s ours
Change-Id: I8867998a7d4908592ab6001d65af6ed3a9169297
Bill Yi [Thu, 20 Oct 2016 15:56:51 +0000 (15:56 +0000)]
Import translations. DO NOT MERGE
am:
7f5b5eee99 -s ours
Change-Id: I550b053800133c76cc6abf3daeefd2790ffe2363
TreeHugger Robot [Thu, 20 Oct 2016 15:54:26 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:53:26 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:52:50 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 20 Oct 2016 14:17:55 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6fffe370549a3c2904043151dee4bc06f6799f81
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 10:57:17 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1d22964ed960d5388377f461a26836d2d24749c
Auto-generated-cl: translation import
OSDN Git Service
