OSDN Git Service
TreeHugger Robot [Sat, 13 Aug 2016 00:13:18 +0000 (00:13 +0000)]
Merge "Update navup button content description when it's menu."
TreeHugger Robot [Fri, 12 Aug 2016 23:36:43 +0000 (23:36 +0000)]
Merge "Allow calls to TimedRemoteCaller in parallel."
Jeff Sharkey [Fri, 12 Aug 2016 22:32:47 +0000 (22:32 +0000)]
Merge "Add property to force restorecon to run." into nyc-mr1-dev am:
54250f58b2 am:
d30d36c13b
am:
bbfd6c460b
Change-Id: I52254ba589717af888f77670a180c048489f2368
Jeff Sharkey [Fri, 12 Aug 2016 22:32:44 +0000 (22:32 +0000)]
Add property to force restorecon to run. am:
6da39a4406 am:
b0648a173c
am:
a8276cbb41
Change-Id: I0930617d5789444fe02632173a497a7076733403
Rob Carr [Fri, 12 Aug 2016 22:32:38 +0000 (22:32 +0000)]
Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev am:
4a86fbc4d9 am:
251cd37b78
am:
0e5bd6c891
Change-Id: I7888cece47eda22cfa006afbf667207e629a7cae
Robert Carr [Fri, 12 Aug 2016 22:32:33 +0000 (22:32 +0000)]
Fix NPE in deferToPendingTransaction. am:
c24078f1a2 am:
885452fe7c
am:
409484440c
Change-Id: Ia7494ade982bcc0eec871cea6c0cd8b930602283
Elliott Hughes [Fri, 12 Aug 2016 22:26:37 +0000 (22:26 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1 am:
2f4c6e3d0d am:
c41a11a0ee
am:
59d4a4ddd0
Change-Id: I6b762f35f7f9bc28e893a058d0c87056786aae2d
Chong Zhang [Fri, 12 Aug 2016 22:26:33 +0000 (22:26 +0000)]
Merge "DO NO MERGE -- Revert the following two commits as they're causing flickering" into nyc-mr1-dev am:
b6ee436eee am:
998b21c6b6
am:
d14f0980da
Change-Id: Iabd07f20674194d75aad4b375e362198516c0173
Chong Zhang [Fri, 12 Aug 2016 22:20:54 +0000 (22:20 +0000)]
DO NO MERGE -- Revert the following two commits as they're causing flickering am:
44bd57ee25 am:
26509f52d3
am:
8a688436ac -s ours
Change-Id: I9326eeee2a34aca480940dc260fe67ec6c20f02f
Rob Carr [Fri, 12 Aug 2016 22:11:27 +0000 (22:11 +0000)]
Merge "Account for scaling of surfaceInset area in magnification." into nyc-mr1-dev am:
60ce77aa38 am:
4c1a2d5f99
am:
9d37d21518
Change-Id: I80875640811cf45d1ffa2a39d84d3756636bec21
Robert Carr [Fri, 12 Aug 2016 22:11:22 +0000 (22:11 +0000)]
Account for scaling of surfaceInset area in magnification. am:
298f9278fd am:
b207428305
am:
23f27428f2
Change-Id: Ice16e3fcaf22faa41b80020d1b1bd8e7694d38be
Philip P. Moltmann [Thu, 11 Aug 2016 00:21:18 +0000 (17:21 -0700)]
Allow calls to TimedRemoteCaller in parallel.
Before the second thread canceled the call from the first thread as the
awaitedSequenceId was set to the second thread.
Change-Id: I7de709dee260a009761e0a3e73f3fe0695d2da2a
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
Chih-Hung Hsieh [Fri, 12 Aug 2016 20:33:02 +0000 (13:33 -0700)]
resolve merge conflicts of
84717d4 to master
Change-Id: I74381544f1157572a212460462e73fd82c12168d
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
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
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
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
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
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
Alexandria Cornwall [Fri, 12 Aug 2016 19:27:31 +0000 (19:27 +0000)]
Merge "AAPT2: Fix resource type id symbol merging"
Kirill Grouchnikov [Fri, 12 Aug 2016 19:02:54 +0000 (19:02 +0000)]
Merge "Document exception thrown in SoundEffectConstants"
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:24:46 +0000 (18:24 +0000)]
Merge "Avoid an NPE while checking view location on screen." into cw-f-dev am:
5e933c1e43
am:
2de53cbfae
Change-Id: I0127eb702cb7e54ae03fb07696cc9db1c8e851fd
Aga Madurska [Fri, 12 Aug 2016 18:24:42 +0000 (18:24 +0000)]
Avoid an NPE while checking view location on screen. am:
a56454645f
am:
a78e8d6219
Change-Id: I70f2333d6f09d7d608a5c201ac3d5be7780bda9e
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
Yohei Yukawa [Fri, 12 Aug 2016 18:13:24 +0000 (18:13 +0000)]
Merge "Fix a race to detemine IME switcher visibilityde" into nyc-mr1-dev am:
41941689b7 am:
9b743f1961
am:
b322a818d7
Change-Id: I09ccb3806ac3f5e85e91f5477c52969bbeaeb363
Yohei Yukawa [Fri, 12 Aug 2016 18:13:21 +0000 (18:13 +0000)]
Fix a race to detemine IME switcher visibilityde am:
982a94c5e3 am:
28c87d5d3b
am:
ed56804385
Change-Id: I89e2f79edf8a8213117f7cb46a2c0438ae6ca874
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
TreeHugger Robot [Fri, 12 Aug 2016 17:53:31 +0000 (17:53 +0000)]
Merge "Enable StrictMode.detectFileUriExposure() for drag and drop"
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
Jason Monk [Fri, 12 Aug 2016 17:41:35 +0000 (17:41 +0000)]
Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev am:
de214f40cf am:
bebd3f3f67
am:
4a337e21ad
Change-Id: I19a9da1c4789779b841218909ab5dbdc27090c7a
Jason Monk [Fri, 12 Aug 2016 17:41:31 +0000 (17:41 +0000)]
Start listening on notifications/QS panels on expansion started am:
b5ece9a9d6 am:
81d51c5da9
am:
dcd90a1cba
Change-Id: Ibbe3de7bd6e79952d1450d76f87810dac60e48af
Tyler Gunn [Fri, 12 Aug 2016 17:32:35 +0000 (17:32 +0000)]
Merge "Add ImsReason codes and DisconnectCauses for data disconnects." into nyc-mr1-dev am:
34910458c4 am:
c05e0a8d35
am:
ba9c77f5f5
Change-Id: I8e92db6b74c01cbac5d8a420fa4b3a0590e127b0
Tyler Gunn [Fri, 12 Aug 2016 17:31:59 +0000 (17:31 +0000)]
Add ImsReason codes and DisconnectCauses for data disconnects. am:
ed21e8fc0c am:
61d1830a49
am:
00101e9438
Change-Id: Iea985a305fb6ba8a6516cd036dc6734c823e5ba4
John Reck [Fri, 12 Aug 2016 17:31:54 +0000 (17:31 +0000)]
Merge "Fix NPE in TextureView" into nyc-mr1-dev am:
4804404e11 am:
8bd8703538
am:
7926832606
Change-Id: I4edc2af18b4af074ed689fb63f905ceb5e7c33b2
TreeHugger Robot [Fri, 12 Aug 2016 17:22:02 +0000 (17:22 +0000)]
Merge "resolve merge conflicts of
cdbdd46 to master"
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
Fan Zhang [Thu, 11 Aug 2016 20:52:04 +0000 (13:52 -0700)]
Update navup button content description when it's menu.
Bug:
30090247
Change-Id: I2ff9529a3dd5f197f2d142ef2993d5d8e90b5645
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
Kirill Grouchnikov [Fri, 12 Aug 2016 17:12:23 +0000 (13:12 -0400)]
Document exception thrown in SoundEffectConstants
Change-Id: Id4ecf66c8c2ac6ead2a79438e4db702fd6dd196e
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
Philip P. Moltmann [Fri, 12 Aug 2016 16:22:25 +0000 (16:22 +0000)]
Merge "Exit enteringAccessoryMode when entered."
John Reck [Fri, 12 Aug 2016 15:24:33 +0000 (08:24 -0700)]
resolve merge conflicts of
cdbdd46 to master
Change-Id: I18a60477799865973fc9d6c876d95e3cee6e5031
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 11:06:09 +0000 (11:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ccd9ff6157 -s ours am:
d4d3503d57 -s ours
am:
71bc495524 -s ours
Change-Id: I47da45416ea954063d16d1e481865c8368410ebf
Bill Yi [Fri, 12 Aug 2016 11:06:05 +0000 (11:06 +0000)]
Import translations. DO NOT MERGE am:
7e33c8c4d2 -s ours am:
4415f7ceca -s ours
am:
00a748e8bf -s ours
Change-Id: Ic3550a31e6bd1f14830d0674464ba451398f117e
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:47:17 +0000 (09:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d97f049315 -s ours am:
a4fc5f2b76 -s ours
am:
5798a13b5e -s ours
Change-Id: I8f53e8edfc54644ca7f79e2c2851d4092a027f86
Bill Yi [Fri, 12 Aug 2016 09:47:10 +0000 (09:47 +0000)]
Import translations. DO NOT MERGE am:
ab3feb2c95 -s ours am:
505a717a4b -s ours
am:
a4314f27bc -s ours
Change-Id: I3aeeae85e5b1cb19af713501b5e59cea1e4fd466
Bill Yi [Fri, 12 Aug 2016 09:47:03 +0000 (09:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
438c3cbffe -s ours am:
545c97d0b8 -s ours
am:
fa25ce0fe4 -s ours
Change-Id: Ie7104c1a647ecaf309093fbee6ebf4c3519d3f52
Bill Yi [Fri, 12 Aug 2016 09:46:56 +0000 (09:46 +0000)]
Import translations. DO NOT MERGE am:
cf9a807e7e -s ours am:
d943567007 -s ours
am:
b0998a8837 -s ours
Change-Id: I2b41f120c6331c40ed9d78f32e073d8fdaa4dd8a
Bill Yi [Fri, 12 Aug 2016 09:39:56 +0000 (09:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d4640c213d -s ours
am:
5de7e1667e -s ours
Change-Id: I2b8e966a25261ee261c030cac6766636845c758a
Bill Yi [Fri, 12 Aug 2016 09:39:51 +0000 (09:39 +0000)]
Import translations. DO NOT MERGE am:
62a3424ebb -s ours
am:
09e331e97b -s ours
Change-Id: If8e1072453fae77f2326a20cc07d7c56a987fbe1
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
OSDN Git Service
