OSDN Git Service
Andreas Huber [Mon, 19 Jun 2017 22:26:46 +0000 (22:26 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am:
b6dde12ef0 am:
e7191f50b5
am:
0cf0b39360
Change-Id: Id47548cd4209bd7d4d0ede478fd5372d31c22a36
Andreas Huber [Mon, 19 Jun 2017 22:19:55 +0000 (22:19 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder" am:
b6dde12ef0
am:
e7191f50b5
Change-Id: If9c376697a638523f6b691fa37d9cfb73fc8e20d
Android Build Merger (Role) [Mon, 19 Jun 2017 22:16:35 +0000 (22:16 +0000)]
Merge "Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8 am:
5cb26b76ff" into oc-dr1-dev-plus-aosp
Eugene Susla [Mon, 19 Jun 2017 22:13:51 +0000 (22:13 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8
am:
5cb26b76ff
Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d
Eugene Susla [Mon, 19 Jun 2017 22:13:44 +0000 (22:13 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev am:
ba003a97f8
am:
c675cf85a7
Change-Id: Id86e6703dfc57705b361adf66da9f852498b32ea
Andreas Huber [Mon, 19 Jun 2017 22:07:45 +0000 (22:07 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"
am:
b6dde12ef0
Change-Id: I342d0d1a09ed1677b7619df7df033471b48c937a
Eugene Susla [Mon, 19 Jun 2017 22:02:14 +0000 (22:02 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
am:
ba003a97f8
Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282
Eugene Susla [Mon, 19 Jun 2017 22:02:13 +0000 (22:02 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
am:
ba003a97f8
Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212
Treehugger Robot [Mon, 19 Jun 2017 21:55:04 +0000 (21:55 +0000)]
Merge "Add an extra level of indirection to make sure that native IHwBinder"
TreeHugger Robot [Mon, 19 Jun 2017 21:52:14 +0000 (21:52 +0000)]
Merge "[Companion] Fix NPE in associate" into oc-dev
Android Build Merger (Role) [Mon, 19 Jun 2017 21:26:50 +0000 (21:26 +0000)]
Merge "Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c am:
2102c3211c" into oc-dr1-dev-plus-aosp
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:53 +0000 (21:24 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c
am:
2102c3211c
Change-Id: I9b58eaa8864140423fbc498b6a32f9ca01082a32
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:24:11 +0000 (21:24 +0000)]
Merge "Do not update currently open tooltip." into oc-dev am:
139dbe5c1c
am:
3fd4215760
Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:45 +0000 (21:12 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
am:
139dbe5c1c
Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514
Vladislav Kaznacheev [Mon, 19 Jun 2017 21:12:41 +0000 (21:12 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
am:
139dbe5c1c
Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449
TreeHugger Robot [Mon, 19 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Do not update currently open tooltip." into oc-dev
Android Build Merger (Role) [Mon, 19 Jun 2017 21:00:56 +0000 (21:00 +0000)]
Merge "Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev am:
43e02a3ec5" into oc-dr1-dev-plus-aosp
Romain Guy [Mon, 19 Jun 2017 21:00:04 +0000 (21:00 +0000)]
Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev
am:
43e02a3ec5
Change-Id: I074555de516f6c59cd09db9cff8ece870b640844
Android Build Merger (Role) [Mon, 19 Jun 2017 20:59:35 +0000 (20:59 +0000)]
Merge "Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8 am:
1ba4f0e1da" into oc-dr1-dev-plus-aosp
Dan Sandler [Mon, 19 Jun 2017 20:58:43 +0000 (20:58 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8
am:
1ba4f0e1da
Change-Id: I1b6fcf9847da63820c8a038ab6b13ed7b89da0d2
Dan Sandler [Mon, 19 Jun 2017 20:56:24 +0000 (20:56 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev am:
5e3fb57af8
am:
0346448a46
Change-Id: Ib361e9e63dae3b0f163f800af8995762070d8c60
TreeHugger Robot [Mon, 19 Jun 2017 20:49:43 +0000 (20:49 +0000)]
Merge "Add support for RGBA_F16 readbacks" into oc-dr1-dev
Dan Sandler [Mon, 19 Jun 2017 20:45:20 +0000 (20:45 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev
am:
5e3fb57af8
Change-Id: I6835b0804b66ad0ee0ff682b29a728f3cceca0bf
Dan Sandler [Mon, 19 Jun 2017 20:45:16 +0000 (20:45 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev
am:
5e3fb57af8
Change-Id: I3f9d2d574ba20adf66d60c41e68b753e44c9c01a
Hall Liu [Mon, 19 Jun 2017 20:35:44 +0000 (20:35 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2' am:
e601160a96 am:
d974296f8c
am:
b5475ab595
Change-Id: If6c24d1af51bd12ef52b546c610cb2b825c34f88
TreeHugger Robot [Mon, 19 Jun 2017 20:32:13 +0000 (20:32 +0000)]
Merge "Reduce no-op notification log messages." into oc-dev
Qingxi Li [Mon, 19 Jun 2017 20:16:11 +0000 (20:16 +0000)]
Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev
am:
7979566c72
Change-Id: I37b2cb8245853b54bb8a8eab92eadec2ed94c63d
Hall Liu [Mon, 19 Jun 2017 20:16:07 +0000 (20:16 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2' am:
e601160a96
am:
d974296f8c
Change-Id: I61d4f04ec27b0298c9ab77dd92bf14d44a1ed93f
Qingxi Li [Mon, 19 Jun 2017 20:07:51 +0000 (20:07 +0000)]
Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev
Hall Liu [Mon, 19 Jun 2017 20:03:42 +0000 (20:03 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2'
am:
e601160a96
Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4
Android Build Merger (Role) [Mon, 19 Jun 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am:
280acdb88b" into oc-dr1-dev-plus-aosp
Yohei Yukawa [Mon, 19 Jun 2017 20:01:06 +0000 (20:01 +0000)]
Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev
am:
280acdb88b
Change-Id: Ia58a8d9ad1c387af2fc6c66f928379df08d6792a
Jakub Pawlowski [Mon, 19 Jun 2017 19:53:44 +0000 (19:53 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" am:
42b1578867 am:
de1f0d7607
am:
8dce179b79
Change-Id: Ic861fcf0507546f522046193939488607a01a042
Hall Liu [Mon, 19 Jun 2017 19:53:40 +0000 (19:53 +0000)]
Merge changes from topics 'embms-init-fix', 'embms-download-2'
* changes:
Add callback for initialization done
Embms download part 2
TreeHugger Robot [Mon, 19 Jun 2017 19:44:45 +0000 (19:44 +0000)]
Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev
Jakub Pawlowski [Mon, 19 Jun 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used" am:
42b1578867
am:
de1f0d7607
Change-Id: I89b5be7443dff10a3a52a0b6dbee76a5d34b8173
Jakub Pawlowski [Mon, 19 Jun 2017 19:26:32 +0000 (19:26 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used"
am:
42b1578867
Change-Id: I8f6f49f0d75c840faa8a7dbdb56a1debecd28d97
Treehugger Robot [Mon, 19 Jun 2017 19:17:38 +0000 (19:17 +0000)]
Merge "Remove legacy advertiser from map after it's no longer used"
Andreas Huber [Fri, 16 Jun 2017 21:56:12 +0000 (14:56 -0700)]
Add an extra level of indirection to make sure that native IHwBinder
objects, while alive, maintain a strong reference to their Java
counterpart.
Bug:
33042939
Test: hidl_test_java
Change-Id: I69179772b3218705e9ef46cbb10b21b6473280d6
Daniel Nishi [Mon, 19 Jun 2017 17:55:32 +0000 (17:55 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev
am:
f69d450b6f
Change-Id: I44ea7994178ca700555479bd5901779c4639f604
Daniel Nishi [Mon, 19 Jun 2017 17:45:16 +0000 (17:45 +0000)]
Merge "Flag the DH no threshold options menu." into oc-dr1-dev
Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]
Remove legacy advertiser from map after it's no longer used
Test: manual
Bug:
62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a
qingxi [Wed, 24 May 2017 23:04:32 +0000 (16:04 -0700)]
Use EuiccManager API to disable current carrier.
Bug:
37353596
Test: existing test
Change-Id: I71e9ab13f48de07d4c7b9e25aabfa3c49dda6fb4
Android Build Merger (Role) [Mon, 19 Jun 2017 17:21:15 +0000 (17:21 +0000)]
Merge "Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f am:
a7853c75b8" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 19 Jun 2017 17:19:19 +0000 (17:19 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f
am:
a7853c75b8
Change-Id: Ifc9d98444bffb923ecbda3d125f50e5a1adf396d
Dianne Hackborn [Mon, 19 Jun 2017 17:18:53 +0000 (17:18 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am:
8a95d49d8f
am:
54c10dca58
Change-Id: Ib4418fa8e1bf1660b622b9015a08a3ea375d2d07
Android Build Merger (Role) [Mon, 19 Jun 2017 17:16:10 +0000 (17:16 +0000)]
Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f am:
04171ecb31" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 19 Jun 2017 17:13:26 +0000 (17:13 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am:
8a95d49d8f
Change-Id: I2d59709712d96b78e1bd5d634e6c31cc0a0d6ff0
Siyamed Sinir [Mon, 19 Jun 2017 17:13:23 +0000 (17:13 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f
am:
92d86d59c0
Change-Id: I690ebf4df8e22a57c5f7b2b5e0267a550db15945
Dianne Hackborn [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am:
8a95d49d8f
Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269
Siyamed Sinir [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am:
58df6ab93f
am:
04171ecb31
Change-Id: I3306e0fd1a7fdf211e330c0a53787f9b1eb5ef1c
Siyamed Sinir [Mon, 19 Jun 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am:
58df6ab93f
Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b
Dianne Hackborn [Mon, 19 Jun 2017 17:04:04 +0000 (17:04 +0000)]
Merge "Maybe fix issue #
62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
Siyamed Sinir [Mon, 19 Jun 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am:
58df6ab93f
Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29
Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]
Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
Android Build Merger (Role) [Mon, 19 Jun 2017 15:45:16 +0000 (15:45 +0000)]
Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10 am:
31c2f1e881" into oc-dr1-dev-plus-aosp
Jason Monk [Mon, 19 Jun 2017 15:43:15 +0000 (15:43 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10
am:
31c2f1e881
Change-Id: Icd1e169bb9538e1ac778469393f4a3be7880368b
Jason Monk [Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev am:
c885c24e10
am:
1a2133629f
Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec
Jason Monk [Mon, 19 Jun 2017 15:33:21 +0000 (15:33 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
am:
c885c24e10
Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1
Jason Monk [Mon, 19 Jun 2017 15:33:12 +0000 (15:33 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
am:
c885c24e10
Change-Id: I70a913e7743e79e90e3d5c1e8bbcb8e6a4071193
TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]
Merge "Fix flash of ambient on fp unlock" into oc-dev
Erik Kline [Mon, 19 Jun 2017 13:37:15 +0000 (13:37 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709 am:
9461f78541
am:
5219f643dd
Change-Id: I39a1744a7fa9b91e3b607429c79f39578e9bde19
Erik Kline [Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)]
Merge "Make interface IP serving code set LinkProperties" am:
1dae9a4709
am:
9461f78541
Change-Id: I753ab701f2109c0972816724e73119dc1dbc4dca
Erik Kline [Mon, 19 Jun 2017 13:15:02 +0000 (13:15 +0000)]
Merge "Make interface IP serving code set LinkProperties"
am:
1dae9a4709
Change-Id: I84e4b3fb0be210f59eb663597a6c81c95d3e51d6
Treehugger Robot [Mon, 19 Jun 2017 13:00:34 +0000 (13:00 +0000)]
Merge "Make interface IP serving code set LinkProperties"
Alessio Balsini [Mon, 19 Jun 2017 12:04:37 +0000 (12:04 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28 am:
6f0adbfaea
am:
fd88d146b4
Change-Id: Iab127e59a59c959e9cd100dff68f415415b0bcce
Alessio Balsini [Mon, 19 Jun 2017 11:54:05 +0000 (11:54 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()" am:
663b02dd28
am:
6f0adbfaea
Change-Id: I0626fb2d9de978f204ba9898a56e4225a71f03e8
Alessio Balsini [Mon, 19 Jun 2017 11:43:00 +0000 (11:43 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()"
am:
663b02dd28
Change-Id: I4953cf4bf4af592e080114bf937453b84b4a3e4e
Treehugger Robot [Mon, 19 Jun 2017 11:29:58 +0000 (11:29 +0000)]
Merge "Documentation: changed tid parameter description for getThreadPriority()"
Alessio Balsini [Wed, 7 Jun 2017 09:41:33 +0000 (11:41 +0200)]
Documentation: changed tid parameter description for getThreadPriority()
Wrong description of the "tid" parameter used by getThreadPriority():
the function does not "change" the priority of the thread associated to
"tid".
Defined also the meaning of setting tid parameter to 0.
Test: None
Change-Id: I8552f3b110eaab1aefa51477e82d3e295547be34
Signed-off-by: Alessio Balsini <alessio.balsini@gmail.com>
Erik Kline [Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
am:
7284e2a88b -s ours
Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd
TreeHugger Robot [Mon, 19 Jun 2017 08:31:31 +0000 (08:31 +0000)]
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]
Make interface IP serving code set LinkProperties
Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics. In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376
Zhijun He [Mon, 19 Jun 2017 05:04:29 +0000 (05:04 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
am:
a34c04d5c3
Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66
TreeHugger Robot [Mon, 19 Jun 2017 04:56:51 +0000 (04:56 +0000)]
Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
Ying Xu [Mon, 19 Jun 2017 04:39:04 +0000 (04:39 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am:
38529959bf -s ours
Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff
Ying Xu [Mon, 19 Jun 2017 04:30:23 +0000 (04:30 +0000)]
Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
Zhijun He [Sun, 18 Jun 2017 23:21:51 +0000 (16:21 -0700)]
Camera2: copy user tag to HFR request list
User tag is not part of native metadata, and need carry over explicitly.
Test: Camera CTS
Bug:
33761753
Change-Id: Ic58783fc204ce71e073f71d0fa50d4d961f4e7ce
Android Build Merger (Role) [Sun, 18 Jun 2017 17:26:19 +0000 (17:26 +0000)]
Merge "Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7 am:
895b695ab0" into oc-dr1-dev-plus-aosp
Todd Kennedy [Sun, 18 Jun 2017 17:24:09 +0000 (17:24 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7
am:
c36175d754
Change-Id: I74774dac4da9a9f270f3ca66780664c82a1a3c05
Todd Kennedy [Sun, 18 Jun 2017 17:24:07 +0000 (17:24 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev am:
65ffdba7f7
am:
895b695ab0
Change-Id: I158aeb4a8327454a067310c7ba51c8487ada5c8d
Todd Kennedy [Sun, 18 Jun 2017 17:15:12 +0000 (17:15 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
am:
65ffdba7f7
Change-Id: I4af23140f4d9ecc2c1e9faa09d03eddb22db9dae
Todd Kennedy [Sun, 18 Jun 2017 17:15:07 +0000 (17:15 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
am:
65ffdba7f7
Change-Id: Ib58b5ed03daa375c0ba667829d4a38567c99ac78
Todd Kennedy [Sun, 18 Jun 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Track both framework and app overlays per package" into oc-dev
Eric Laurent [Sun, 18 Jun 2017 05:24:33 +0000 (05:24 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
am:
95b41415cd
Change-Id: Ib0b79a1526c32fcd7c4cc253feac77ba0f4d3bae
TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]
Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
Lucas Dupin [Sat, 17 Jun 2017 17:26:20 +0000 (17:26 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
am:
11cc260047
Change-Id: If99425cb57a322900f476227932cdcadd85abf00
Lucas Dupin [Sat, 17 Jun 2017 17:20:59 +0000 (17:20 +0000)]
Merge "K-Means color clustering" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 11:36:22 +0000 (11:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3a759c93b8 -s ours
Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f
TreeHugger Robot [Sat, 17 Jun 2017 11:29:10 +0000 (11:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
767d02158e -s ours
Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0
Bill Yi [Sat, 17 Jun 2017 06:16:42 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
dee1ecf9df -s ours
Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5
Bill Yi [Sat, 17 Jun 2017 06:12:21 +0000 (06:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f0bdfbc508 -s ours
am:
c4e253af2a -s ours
Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066
TreeHugger Robot [Sat, 17 Jun 2017 06:10:52 +0000 (06:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 17 Jun 2017 06:07:03 +0000 (06:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2
Bill Yi [Sat, 17 Jun 2017 06:06:58 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f0bdfbc508 -s ours
Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74
TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Sat, 17 Jun 2017 04:22:31 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6dc3d54f22f40b9079b6a7e55def38409cc48e89
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 17 Jun 2017 03:05:09 +0000 (03:05 +0000)]
Merge "Merge "Only preload selected pages" into oc-dev am:
314457a424 am:
4116849cfb" into oc-dr1-dev-plus-aosp
Philip P. Moltmann [Sat, 17 Jun 2017 03:02:42 +0000 (03:02 +0000)]
Merge "Only preload selected pages" into oc-dev am:
314457a424
am:
1af7c0bdbe
Change-Id: Ia3ecca3507a8d3b2e18dee59f83af0c0804ab68c