OSDN Git Service
Robert Carr [Sat, 13 Aug 2016 00:04:03 +0000 (00:04 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev am:
64d7220153
am:
8c9aa63827
Change-Id: I3def8f6d7fdc08104a0b428f436967481dd578fb
Robert Carr [Sat, 13 Aug 2016 00:03:55 +0000 (00:03 +0000)]
Copy exiting app token list while stepping animation. am:
46831fa9ff
am:
8cf4062a07
Change-Id: Iee486eaeaca5211c2ee284602b9e593be385e03c
Robert Carr [Fri, 12 Aug 2016 23:55:31 +0000 (23:55 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
am:
64d7220153
Change-Id: I02e3fc3a6738f6b691b57fa3f2771d647e93cd7a
Robert Carr [Fri, 12 Aug 2016 23:55:28 +0000 (23:55 +0000)]
Copy exiting app token list while stepping animation.
am:
46831fa9ff
Change-Id: I53c41afd54b9a315a0734dce357b1eef8485b84b
TreeHugger Robot [Fri, 12 Aug 2016 23:48:12 +0000 (23:48 +0000)]
Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
Hui Shu [Fri, 12 Aug 2016 23:19:45 +0000 (23:19 +0000)]
Merge "Fix documentation." into nyc-mr1-dev am:
caef4afe42
am:
42373881fe
Change-Id: I08d8c3868c396da7a63ce4c716f3267d225390fe
Hui Shu [Fri, 12 Aug 2016 23:19:41 +0000 (23:19 +0000)]
Fix documentation. am:
bd042e666a
am:
440d84f99a
Change-Id: I1d0c75c6692557e1d66ca66036bceda6ca62c702
Phil Weaver [Fri, 12 Aug 2016 23:19:37 +0000 (23:19 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35 am:
b0d9af4e2b
am:
136111cb96
Change-Id: Ie8283c36b339d5baf9473817fe00a858b8f16321
Adrian Roos [Fri, 12 Aug 2016 23:18:23 +0000 (23:18 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am:
1ee928a62a
am:
6d635c1960
Change-Id: I0766aefff761f7a79f9c78bdf57e46429132ceb7
Adrian Roos [Fri, 12 Aug 2016 23:16:53 +0000 (23:16 +0000)]
Assist: Allow disabling the disclosure animation am:
2335bd6787
am:
57d1601849
Change-Id: I5954913f4f210e47d5e3a297f25d3f646cdd2a4b
Robert Carr [Fri, 12 Aug 2016 20:50:38 +0000 (13:50 -0700)]
Copy exiting app token list while stepping animation.
Stepping the animation can lead to WindowStateAnimator#finishExit,
which can lead to WindowManagerService#removeWindowInnerLocked, which
can immediately call WindowSurfacePlacer.performSurfacePlacement. From
here we will directly modify mExitingAppTokens for each stack and remove
tokens where exiting is complete. I think removeWindowInnerLocked making
a direct call to performSurfacePlacement is questionable...but changing
semantics there is very risky. For now, simply avoid processing tokens
in the animator if the surface placer has removed them. It seems all we
would want to do is trigger a layout pass, which has just occured anyway.
Bug:
30813094
Change-Id: Iaff77d227e09839f7e6edda6b8f188d164e6da74
Hui Shu [Fri, 12 Aug 2016 21:29:50 +0000 (21:29 +0000)]
Merge "Fix documentation." into nyc-mr1-dev
am:
caef4afe42
Change-Id: Icae5423ea33b2cbbfe120540818a23bdab0a8d2b
Hui Shu [Fri, 12 Aug 2016 21:29:47 +0000 (21:29 +0000)]
Fix documentation.
am:
bd042e666a
Change-Id: Ib749bd51c24a2012cd2b0d87ed70c034f410bc58
Hui Shu [Fri, 12 Aug 2016 21:24:42 +0000 (21:24 +0000)]
Merge "Fix documentation." into nyc-mr1-dev
Phil Weaver [Fri, 12 Aug 2016 21:22:04 +0000 (21:22 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35
am:
9e07404742
Change-Id: Ib855aa8aef984477c1bdfdac5c505381a4a219c8
Phil Weaver [Fri, 12 Aug 2016 21:14:48 +0000 (21:14 +0000)]
Limit capabilities of a11y gesture dispatch. am:
157f416a35
am:
b0d9af4e2b
Change-Id: I95224013192c03b686be454fccf5aef65717a699
Phil Weaver [Fri, 12 Aug 2016 21:05:15 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: I260318856e390a585b0fdf404a10916f2ee5af82
Phil Weaver [Fri, 12 Aug 2016 21:05:00 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
Alison Cichowlas [Fri, 12 Aug 2016 20:38:04 +0000 (20:38 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev am:
c7d6af6cd0
am:
4445f1e74e
Change-Id: Idc63aff5b4ae607f74bf0e9f7cfa111250c35eda
Adrian Roos [Fri, 12 Aug 2016 20:35:38 +0000 (20:35 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
am:
1ee928a62a
Change-Id: Ia37585801686d1533dfec798a2928469907a0477
Alison Cichowlas [Fri, 12 Aug 2016 20:35:27 +0000 (20:35 +0000)]
Add restart to GlobalActions. am:
f8eca405c1
am:
091fc718d4
Change-Id: Ib0cc25ec7887366ee65a27aed7497cdbbac861b1
Adrian Roos [Fri, 12 Aug 2016 20:35:22 +0000 (20:35 +0000)]
Assist: Allow disabling the disclosure animation
am:
2335bd6787
Change-Id: I2a88e088da3062b7bd10581650de526629973c67
Jeff Sharkey [Fri, 12 Aug 2016 20:35:20 +0000 (20:35 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev am:
54250f58b2
am:
d30d36c13b
Change-Id: Id1c20d75ee02714714cf77ad37a37b88e44c936f
Jeff Sharkey [Fri, 12 Aug 2016 20:35:14 +0000 (20:35 +0000)]
Add property to force restorecon to run. am:
6da39a4406
am:
b0648a173c
Change-Id: I2f244b6a467df6674da4fcac380b9f276a1ee6ca
Rob Carr [Fri, 12 Aug 2016 20:35:06 +0000 (20:35 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev am:
4a86fbc4d9
am:
251cd37b78
Change-Id: I1006878a32a0be2608fb29667b401e4be64e1a6b
Robert Carr [Fri, 12 Aug 2016 20:34:31 +0000 (20:34 +0000)]
Fix NPE in deferToPendingTransaction. am:
c24078f1a2
am:
885452fe7c
Change-Id: I8d2f3da3203237e4406ad8f7938b062f8e2fb293
TreeHugger Robot [Fri, 12 Aug 2016 20:28:10 +0000 (20:28 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
Elliott Hughes [Fri, 12 Aug 2016 20:19:16 +0000 (20:19 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1 am:
2f4c6e3d0d
am:
c41a11a0ee
Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c
Alison Cichowlas [Fri, 12 Aug 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev
am:
c7d6af6cd0
Change-Id: I171146f2ebce01147af8816ee8b69765d46f7ecf
Alison Cichowlas [Fri, 12 Aug 2016 20:18:41 +0000 (20:18 +0000)]
Add restart to GlobalActions.
am:
f8eca405c1
Change-Id: Ib9664d086e2ac57db905fbfa03329c1a990051fc
Jeff Sharkey [Fri, 12 Aug 2016 20:18:38 +0000 (20:18 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev
am:
54250f58b2
Change-Id: Ie7fedd80755d76f144a6bfdd50c3c34dc6da7f0e
Jeff Sharkey [Fri, 12 Aug 2016 20:18:35 +0000 (20:18 +0000)]
Add property to force restorecon to run.
am:
6da39a4406
Change-Id: I5eb34da7d5e9a30c23c338cfe1f69d8d3a01854e
Alison Cichowlas [Fri, 12 Aug 2016 20:12:37 +0000 (20:12 +0000)]
Merge "Add restart to GlobalActions." into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 20:12:15 +0000 (20:12 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev
Rob Carr [Fri, 12 Aug 2016 20:10:46 +0000 (20:10 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev
am:
4a86fbc4d9
Change-Id: I9d36ac2b39d872dd91d0888e355f7c7098522c30
Robert Carr [Fri, 12 Aug 2016 20:10:43 +0000 (20:10 +0000)]
Fix NPE in deferToPendingTransaction.
am:
c24078f1a2
Change-Id: I9755399b591ab66e35884bdd37432a2350ad68e0
Elliott Hughes [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1
am:
2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
Rob Carr [Fri, 12 Aug 2016 20:00:05 +0000 (20:00 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev
Chong Zhang [Fri, 12 Aug 2016 19:58:59 +0000 (19:58 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am:
b6ee436eee
am:
998b21c6b6
Change-Id: Ida9b5486a8aee873893a7d14b9aa07b83692049b
Elliott Hughes [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "recvfrom takes a non-const pointer."
am:
96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
Chong Zhang [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering am:
44bd57ee25
am:
26509f52d3
Change-Id: Ib2bf3635fad139f4eddbe05a2961e639efa58652
Rob Carr [Fri, 12 Aug 2016 19:58:50 +0000 (19:58 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am:
60ce77aa38
am:
4c1a2d5f99
Change-Id: I7fec3fded8e3b15c3026ca0ce1cad41a7d63e559
Robert Carr [Fri, 12 Aug 2016 19:58:44 +0000 (19:58 +0000)]
Account for scaling of surfaceInset area in magnification. am:
298f9278fd
am:
b207428305
Change-Id: I466ec1c5a155640561d1559258421bffacea06ba
Chong Zhang [Fri, 12 Aug 2016 19:49:18 +0000 (19:49 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
am:
b6ee436eee
Change-Id: If0dbc782680fe95d1a460ab8109ed94fd0419e25
Chong Zhang [Fri, 12 Aug 2016 19:49:16 +0000 (19:49 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering
am:
44bd57ee25
Change-Id: Ie4504d027160fd58c3dab7dc372849f2a1e4ae51
Treehugger Robot [Fri, 12 Aug 2016 19:48:38 +0000 (19:48 +0000)]
Merge "recvfrom takes a non-const pointer."
Chong Zhang [Fri, 12 Aug 2016 19:44:11 +0000 (19:44 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev
Rob Carr [Fri, 12 Aug 2016 19:42:52 +0000 (19:42 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
am:
60ce77aa38
Change-Id: I5950a6c5643152d95f0e108250d71b93c96ebf76
Robert Carr [Fri, 12 Aug 2016 19:42:46 +0000 (19:42 +0000)]
Account for scaling of surfaceInset area in magnification.
am:
298f9278fd
Change-Id: I252c1d7810fb877c478f9042a01bc6577bf24179
Chong Zhang [Fri, 12 Aug 2016 18:44:52 +0000 (11:44 -0700)]
DO NO MERGE -- Revert the following two commits as they're causing flickering
When double tapping Recents, need to reinvestigate.
b/
30831873
b/
30790402
Revert "Clear WS.mDestroying on AWT.clearAnimatingFlags"
This reverts commit
c2661e52eae3161ac8c02e831290ad50ad395be2.
Revert "Some fixes for transition animation selection"
This reverts commit
73e9bc3f1557f0320c8af843dfb051f27187361d.
Rob Carr [Fri, 12 Aug 2016 19:37:15 +0000 (19:37 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev
Chih-Hung Hsieh [Fri, 12 Aug 2016 19:35:08 +0000 (19:35 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master am:
b3d46b44a3
am:
c76aa69207
Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b
Chih-Hung Hsieh [Fri, 12 Aug 2016 19:30:02 +0000 (19:30 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master
am:
b3d46b44a3
Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
Adrian Roos [Thu, 11 Aug 2016 22:42:40 +0000 (15:42 -0700)]
Assist: Allow disabling the disclosure animation
Change-Id: I6e7ed00f066fda7cc268119e7aa4133010aa69c1
Fixes:
30809067
Chih-Hung Hsieh [Fri, 12 Aug 2016 18:35:17 +0000 (11:35 -0700)]
resolve merge conflicts of
17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
Jeff Sharkey [Fri, 12 Aug 2016 18:26:54 +0000 (12:26 -0600)]
Add property to force restorecon to run.
As an optimization, we typically only run restorecon when
seapp_contexts changes. This CL checks a property that can be used
to always force a restorecon to help investigate boot timing.
Bug:
30213213
Change-Id: I4d65c1a4e4a0830ef4a32cd2fae1d3ab188b65cc
Agnieszka Madurska [Fri, 12 Aug 2016 18:18:05 +0000 (18:18 +0000)]
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev
am:
5e933c1e43
Change-Id: I85717167942c00228ae270932d6d87d46d9c8ef2
Aga Madurska [Fri, 12 Aug 2016 18:18:01 +0000 (18:18 +0000)]
Avoid an NPE while checking view location on screen.
am:
a56454645f
Change-Id: I052e1e3f18a1df3a4ef43b87a1709d14eef21df1
Agnieszka Madurska [Fri, 12 Aug 2016 18:08:23 +0000 (18:08 +0000)]
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev
Chih-hung Hsieh [Fri, 12 Aug 2016 18:05:32 +0000 (18:05 +0000)]
Merge "Fix clang-tidy warnings in aapt and aapt2."
Yohei Yukawa [Fri, 12 Aug 2016 18:05:09 +0000 (18:05 +0000)]
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev am:
41941689b7
am:
9b743f1961
Change-Id: I2275f171ebb469b0885bd809a4915e1f8b399bd1
Yohei Yukawa [Fri, 12 Aug 2016 18:05:00 +0000 (18:05 +0000)]
Fix a race to detemine IME switcher visibilityde am:
982a94c5e3
am:
28c87d5d3b
Change-Id: I2dd8354b3addeb9f989e8df73ab5edfefe91fbac
Elliott Hughes [Fri, 12 Aug 2016 17:53:48 +0000 (10:53 -0700)]
recvfrom takes a non-const pointer.
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
Yohei Yukawa [Fri, 12 Aug 2016 17:50:07 +0000 (17:50 +0000)]
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev
am:
41941689b7
Change-Id: Iba7b21e59241d67feff11346ae4f591d9946ed1f
Yohei Yukawa [Fri, 12 Aug 2016 17:50:05 +0000 (17:50 +0000)]
Fix a race to detemine IME switcher visibilityde
am:
982a94c5e3
Change-Id: I03f2a9377a72d9c9e826bf4bffd81a85b90eca83
Yohei Yukawa [Fri, 12 Aug 2016 17:43:42 +0000 (17:43 +0000)]
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev
Alison Cichowlas [Fri, 5 Aug 2016 18:50:27 +0000 (14:50 -0400)]
Add restart to GlobalActions.
Update power icon in GlobalActions for consistency
with new restart icon.
Bug:
30395806
Change-Id: I5ab20c15c889384fb685fc678fbf9ed912fcde5d
Jason Monk [Fri, 12 Aug 2016 17:19:36 +0000 (17:19 +0000)]
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev am:
de214f40cf
am:
bebd3f3f67
Change-Id: Icb79e11f1399f12cca7e018e5237e4adc98e627d
Jason Monk [Fri, 12 Aug 2016 17:19:32 +0000 (17:19 +0000)]
Start listening on notifications/QS panels on expansion started am:
b5ece9a9d6
am:
81d51c5da9
Change-Id: Ib62be93bca8981d839458f490a5331b461cd0429
Jason Monk [Fri, 12 Aug 2016 17:12:37 +0000 (17:12 +0000)]
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev
am:
de214f40cf
Change-Id: Ib59d84910f053548e8a019e7c8be2c9b0b025dbe
Jason Monk [Fri, 12 Aug 2016 17:12:35 +0000 (17:12 +0000)]
Start listening on notifications/QS panels on expansion started
am:
b5ece9a9d6
Change-Id: I948930f17c1d0e08ba3d33ea5db48e3071b2fe03
Jason Monk [Fri, 12 Aug 2016 17:04:45 +0000 (17:04 +0000)]
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev
Aga Madurska [Fri, 12 Aug 2016 09:17:49 +0000 (10:17 +0100)]
Avoid an NPE while checking view location on screen.
Bug:
30483148
Change-Id: I115da4fefff5fecc04135e2b150e1e77445cb86e
Tyler Gunn [Fri, 12 Aug 2016 15:08:31 +0000 (15:08 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev am:
34910458c4
am:
c05e0a8d35
Change-Id: If22e4fe4327ef7cd62873ee5431a60a5f029d404
Tyler Gunn [Fri, 12 Aug 2016 15:07:10 +0000 (15:07 +0000)]
Add ImsReason codes and DisconnectCauses for data disconnects. am:
ed21e8fc0c
am:
61d1830a49
Change-Id: I3f35db127ef21adbcb086879f4b92eacac72974c
Tyler Gunn [Fri, 12 Aug 2016 14:59:37 +0000 (14:59 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
am:
34910458c4
Change-Id: I5d1d6a7067376dc765224ef27fbee25b86334a9a
Tyler Gunn [Fri, 12 Aug 2016 14:59:27 +0000 (14:59 +0000)]
Add ImsReason codes and DisconnectCauses for data disconnects.
am:
ed21e8fc0c
Change-Id: I468ab4a5e16bd08aa80c50c1cfc583e0004ea1ab
Tyler Gunn [Fri, 12 Aug 2016 14:54:26 +0000 (14:54 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev
John Reck [Fri, 12 Aug 2016 14:39:45 +0000 (14:39 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev am:
4804404e11
am:
8bd8703538
Change-Id: Ia14fc3478f914453e77fc94180e5972da5cd5aea
John Reck [Fri, 12 Aug 2016 14:39:36 +0000 (14:39 +0000)]
Fix NPE in TextureView am:
7e237189c2
am:
ed1f1399d4
Change-Id: I1166edf4590e2846e6c115cbe9c9455ee46b64b5
John Reck [Fri, 12 Aug 2016 14:31:52 +0000 (14:31 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev
am:
4804404e11
Change-Id: Iab6ecc3b6a5bf9d8921297dec9a0f93ff1abc397
John Reck [Fri, 12 Aug 2016 14:31:49 +0000 (14:31 +0000)]
Fix NPE in TextureView
am:
7e237189c2
Change-Id: I16d37e5c8ab6b81b57f510be5cdea09047cdbd79
John Reck [Fri, 12 Aug 2016 14:25:14 +0000 (14:25 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 10:58:14 +0000 (10:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ccd9ff6157 -s ours
am:
d4d3503d57 -s ours
Change-Id: I328576af4b4f006176a98fe8279e44803bb80432
Bill Yi [Fri, 12 Aug 2016 10:58:09 +0000 (10:58 +0000)]
Import translations. DO NOT MERGE am:
7e33c8c4d2 -s ours
am:
4415f7ceca -s ours
Change-Id: Ied502c98f68e9ff417fc2babbf26f8bb952f454a
Bill Yi [Fri, 12 Aug 2016 10:51:37 +0000 (10:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ccd9ff6157 -s ours
Change-Id: I2191e7d4670a9852c72bf18cef1513cd7236ee80
Bill Yi [Fri, 12 Aug 2016 10:51:35 +0000 (10:51 +0000)]
Import translations. DO NOT MERGE
am:
7e33c8c4d2 -s ours
Change-Id: Iafc428588907eee40e8d1f8a3f306179c0cf83ff
TreeHugger Robot [Fri, 12 Aug 2016 10:44:40 +0000 (10:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 09:39:46 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d97f049315 -s ours
am:
a4fc5f2b76 -s ours
Change-Id: I32213fc43c9f653b35ee856d72284158a5ae8d1a
Bill Yi [Fri, 12 Aug 2016 09:39:42 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
ab3feb2c95 -s ours
am:
505a717a4b -s ours
Change-Id: I5d36313dfee93f7bbd4e0c0d2624e6ead1bc8b44
Bill Yi [Fri, 12 Aug 2016 09:39:38 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
438c3cbffe -s ours
am:
545c97d0b8 -s ours
Change-Id: I4502b45acbe9c6e23f13bb8f2279bb31e8550cd5
Bill Yi [Fri, 12 Aug 2016 09:39:34 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
cf9a807e7e -s ours
am:
d943567007 -s ours
Change-Id: I123efbf60e6b08e6eab6234ab5eeb8a5fc49e593
Bill Yi [Fri, 12 Aug 2016 09:34:32 +0000 (09:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d4640c213d -s ours
Change-Id: I5ee0e42879aaf09a93813de1d5cdb9e8c52734f2
Bill Yi [Fri, 12 Aug 2016 09:34:26 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
62a3424ebb -s ours
Change-Id: Id431b60d75f6cd548b2b7595cc1d8b1032594571
Bill Yi [Fri, 12 Aug 2016 09:32:00 +0000 (09:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d97f049315 -s ours
Change-Id: I33e2836cf2560848cbb35d25df34757672960ac1
Bill Yi [Fri, 12 Aug 2016 09:31:58 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
ab3feb2c95 -s ours
Change-Id: Ic1d0955c598c90d8d86a99d6dc19f7a12d476541
Bill Yi [Fri, 12 Aug 2016 09:31:55 +0000 (09:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
438c3cbffe -s ours
Change-Id: I1678c90c02ce16239aabcbf66aa3573d33ea1fca
Bill Yi [Fri, 12 Aug 2016 09:31:54 +0000 (09:31 +0000)]
Import translations. DO NOT MERGE
am:
cf9a807e7e -s ours
Change-Id: Ib6dd7fb5af9678f7e8bfc8ce55d4f34e9b7a7b59
TreeHugger Robot [Fri, 12 Aug 2016 09:25:27 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:24:37 +0000 (09:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
OSDN Git Service
