OSDN Git Service
Bill Yi [Wed, 2 Aug 2017 07:16:15 +0000 (00:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I18b8424415b793d5ce72a08ab9d1a40c7e99f624
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jason Monk [Tue, 1 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d am:
29b1a86af3
am:
8a36711334
Change-Id: I78a1446dd91cf19db9a866e12d4dccebac7bf684
Fyodor Kupolov [Tue, 1 Aug 2017 20:08:32 +0000 (20:08 +0000)]
Merge "Log package parse timings" into oc-mr1-dev am:
cd0d29e9fc
am:
7881a63734
Change-Id: I45d395d6830c25702797068e14e2341a4e250326
Jason Monk [Tue, 1 Aug 2017 20:07:56 +0000 (20:07 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d
am:
29b1a86af3
Change-Id: Ieace05c849161fefa9e911968c3306f93e65aea3
Android Build Merger (Role) [Tue, 1 Aug 2017 19:59:07 +0000 (19:59 +0000)]
Merge "Merge "Minor Autofill javadoc fix." into oc-mr1-dev am:
7fecc73f52 am:
06b841a11f"
Felipe Leme [Tue, 1 Aug 2017 19:56:23 +0000 (19:56 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev am:
7fecc73f52
am:
06b841a11f
Change-Id: Ie9357578dfa09cb05c27dff78949222ad9796d2d
Adam Lesinski [Tue, 1 Aug 2017 19:56:09 +0000 (19:56 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool"
Jason Monk [Tue, 1 Aug 2017 19:53:00 +0000 (19:53 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am:
7d08ca6e4d
Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2
Fyodor Kupolov [Tue, 1 Aug 2017 19:51:22 +0000 (19:51 +0000)]
Merge "Log package parse timings" into oc-mr1-dev
am:
cd0d29e9fc
Change-Id: I5f0a4cffef76cc0b5124791009bd96e0a9078d3e
TreeHugger Robot [Tue, 1 Aug 2017 19:46:29 +0000 (19:46 +0000)]
Merge "Log package parse timings" into oc-mr1-dev
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:41:23 +0000 (19:41 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev am:
69840ca338 am:
fb80072f99
am:
5bbbd5a659
Change-Id: If46bb556450e15b7f660e8c75cd54ec34f451cc3
Jason Monk [Tue, 1 Aug 2017 19:41:10 +0000 (19:41 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
Felipe Leme [Tue, 1 Aug 2017 19:40:27 +0000 (19:40 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev
am:
7fecc73f52
Change-Id: Ia1dafe5e6be8df7b331f735da1d0c59c72f68891
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:37:13 +0000 (19:37 +0000)]
Merge "Merge "Reword analog audio not supported notification" into oc-dr1-dev am:
69840ca338 am:
89163cf020" into oc-mr1-dev-plus-aosp
am:
02cd3d932e
Change-Id: Ia2f901637f4b5b21292eca5cb6ba5836917ff513
Adam Lesinski [Tue, 1 Aug 2017 19:34:13 +0000 (19:34 +0000)]
Merge "Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am:
50d25dc00c am:
5d55b72645" into oc-mr1-dev-plus-aosp
am:
eccfd919eb
Change-Id: I17a68c825730baf45854abddc1a2097f13623ff6
Felipe Leme [Tue, 1 Aug 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev
Adam Lesinski [Tue, 1 Aug 2017 19:30:38 +0000 (19:30 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am:
50d25dc00c am:
c199e3fdf1
am:
ecd6447dc7
Change-Id: I28e68ae14b07c04c18bde07b3a729c2f10af7b5a
Jason Monk [Tue, 1 Aug 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev am:
cb5e0e63b4 am:
49ade8dc97
am:
81818bd581
Change-Id: I9d279d689b2c1625aebda48668d17f9d06a3f581
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:20:30 +0000 (19:20 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev am:
69840ca338
am:
fb80072f99
Change-Id: Ic33159b91376eaec49f4115b1bf91419edbe6d21
Jason Monk [Tue, 1 Aug 2017 19:19:17 +0000 (19:19 +0000)]
Merge "Merge "Cleanup QS dialogs" into oc-dr1-dev am:
cb5e0e63b4 am:
41f4ab44a2" into oc-mr1-dev-plus-aosp
am:
bce7f1da6a
Change-Id: I294777a6d383d43a742ea6f561c13ad6a91cfd23
Android Build Merger (Role) [Tue, 1 Aug 2017 19:17:31 +0000 (19:17 +0000)]
Merge "Merge "Reword analog audio not supported notification" into oc-dr1-dev am:
69840ca338 am:
89163cf020" into oc-mr1-dev-plus-aosp
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:15:49 +0000 (19:15 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev am:
69840ca338
am:
89163cf020
Change-Id: Idf481243ae12d62e2fe492d7834ef0d8e7476a04
Android Build Merger (Role) [Tue, 1 Aug 2017 19:15:16 +0000 (19:15 +0000)]
Merge "Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am:
50d25dc00c am:
5d55b72645" into oc-mr1-dev-plus-aosp
Adam Lesinski [Tue, 1 Aug 2017 19:11:57 +0000 (19:11 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am:
50d25dc00c
am:
5d55b72645
Change-Id: Ic5f17ce732774c02cd77810873b17ffd7ee33da5
Adam Lesinski [Tue, 1 Aug 2017 19:10:24 +0000 (19:10 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am:
50d25dc00c
am:
c199e3fdf1
Change-Id: I9a0748044e5409853c13a72589b1cb505956ce50
Calin Juravle [Tue, 1 Aug 2017 19:08:29 +0000 (19:08 +0000)]
Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev am:
565cab11ff
am:
e93209ba98
Change-Id: I38ef2bb17309b7f427a0da2ac1d2b963c7d48d61
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:57 +0000 (19:03 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am:
69840ca338
Change-Id: Id3dc3a226f4830cd7ec748db826283d4889d82e0
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am:
69840ca338
Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b
Jason Monk [Tue, 1 Aug 2017 19:02:01 +0000 (19:02 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev am:
cb5e0e63b4
am:
49ade8dc97
Change-Id: I59c1c114355a6e416b0ecba515e340e8c7e65668
Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am:
50d25dc00c
Change-Id: Idfbbe397c5019d4f01502a5ee2ce7a04cd7efdba
Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am:
50d25dc00c
Change-Id: I33fc54b3ae91f9e616022ccf2f6cf7e5440e0b25
Android Build Merger (Role) [Tue, 1 Aug 2017 18:57:13 +0000 (18:57 +0000)]
Merge "Merge "Cleanup QS dialogs" into oc-dr1-dev am:
cb5e0e63b4 am:
41f4ab44a2" into oc-mr1-dev-plus-aosp
Jason Monk [Tue, 1 Aug 2017 18:55:16 +0000 (18:55 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev am:
cb5e0e63b4
am:
41f4ab44a2
Change-Id: I86f7a4bd3722a5980c0641d9f441afcc4044222c
TreeHugger Robot [Tue, 1 Aug 2017 18:51:53 +0000 (18:51 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
Calin Juravle [Tue, 1 Aug 2017 18:51:28 +0000 (18:51 +0000)]
Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
am:
565cab11ff
Change-Id: I11f2a6d1df31d1a27ce5295bcdf6fbbd540060bc
Alison Cichowlas [Tue, 1 Aug 2017 18:48:57 +0000 (18:48 +0000)]
Merge "Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am:
39a556f1d8 am:
9e7e827d05" into oc-mr1-dev-plus-aosp
am:
533c77b47a
Change-Id: Iea638b7a777c20be4cdd265dc1e6df8eafd7b33b
Jason Monk [Tue, 1 Aug 2017 18:48:01 +0000 (18:48 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
am:
cb5e0e63b4
Change-Id: Ib51f630bfe644e9deaec73c32dc4f3d6aa9237b5
Adam Lesinski [Tue, 1 Aug 2017 18:47:42 +0000 (18:47 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 18:47:22 +0000 (18:47 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
am:
cb5e0e63b4
Change-Id: Iae6cbee1ff7901bc36f38343e822b99063e8fe57
Alison Cichowlas [Tue, 1 Aug 2017 18:45:02 +0000 (18:45 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am:
39a556f1d8 am:
b7ac4ca5a8
am:
a41c839d55
Change-Id: Iefbe36c3f70c941d6986e201bf04bdc1b5f901f5
Calin Juravle [Tue, 1 Aug 2017 18:38:05 +0000 (18:38 +0000)]
Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
* changes:
Use the class loader context when optimizing secondary dex files
Add DexClassLoader to the list of supported class loaders
Bill Yi [Tue, 1 Aug 2017 18:37:42 +0000 (18:37 +0000)]
Merge "Import translations. DO NOT MERGE"
Android Build Merger (Role) [Tue, 1 Aug 2017 18:36:36 +0000 (18:36 +0000)]
Merge "Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am:
39a556f1d8 am:
9e7e827d05" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 18:36:30 +0000 (18:36 +0000)]
Merge "Merge "Fix issue #
64140901: Maps crashed entering PIP right after..." into oc-mr1-dev am:
bd3d2900a3 am:
d30bbfa794"
Alison Cichowlas [Tue, 1 Aug 2017 18:33:41 +0000 (18:33 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am:
39a556f1d8
am:
b7ac4ca5a8
Change-Id: I320e50928e251d62fcbe852e13c8d87792aad81c
Dianne Hackborn [Tue, 1 Aug 2017 18:33:41 +0000 (18:33 +0000)]
Merge "Fix issue #
64140901: Maps crashed entering PIP right after..." into oc-mr1-dev am:
bd3d2900a3
am:
d30bbfa794
Change-Id: Ia8adf02c6e5989c1011574891971037a50df30b4
Alison Cichowlas [Tue, 1 Aug 2017 18:33:20 +0000 (18:33 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am:
39a556f1d8
am:
9e7e827d05
Change-Id: I4c041cd9b5c62eacde3afea19188f0d4a5ea94a6
Bill Yi [Tue, 1 Aug 2017 18:32:12 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Tue, 1 Aug 2017 18:31:15 +0000 (18:31 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
Dianne Hackborn [Tue, 1 Aug 2017 18:20:34 +0000 (18:20 +0000)]
Merge "Fix issue #
64140901: Maps crashed entering PIP right after..." into oc-mr1-dev
am:
bd3d2900a3
Change-Id: I2f2f6d3c6177f1324421643e01e9bd6cf20b6d75
Alison Cichowlas [Tue, 1 Aug 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am:
39a556f1d8
Change-Id: Idd341f7969c40184327428fc27b9f597dab57905
Alison Cichowlas [Tue, 1 Aug 2017 18:18:45 +0000 (18:18 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am:
39a556f1d8
Change-Id: I51580faadf97d828d5b2c4d7adba99cd7d36d4f2
Tomasz Wasilczyk [Tue, 1 Aug 2017 18:07:44 +0000 (18:07 +0000)]
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev am:
f299ab10e7
am:
5f935d47db
Change-Id: I2c2212cd3dcddfb400fe2dcb4afd3df202038b82
Alison Cichowlas [Tue, 1 Aug 2017 18:06:39 +0000 (18:06 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
Dianne Hackborn [Tue, 1 Aug 2017 18:06:13 +0000 (18:06 +0000)]
Merge "Fix issue #
64140901: Maps crashed entering PIP right after..." into oc-mr1-dev
Tomasz Wasilczyk [Tue, 1 Aug 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
am:
f299ab10e7
Change-Id: Ia2955b23a8e07a7ca921c93187454c488be08041
Seigo Nonaka [Tue, 1 Aug 2017 17:45:23 +0000 (17:45 +0000)]
Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev am:
1c34ba15b5
am:
ae0b9ee687 -s ours
Change-Id: Ic648ff16b2fa569bf1d34de0c109817c54588338
Tomasz Wasilczyk [Tue, 1 Aug 2017 17:43:02 +0000 (17:43 +0000)]
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
Seigo Nonaka [Tue, 1 Aug 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev
am:
1c34ba15b5
Change-Id: I6082a49060d322c068b9af4e5b6e169cff6a86bb
TreeHugger Robot [Tue, 1 Aug 2017 17:29:35 +0000 (17:29 +0000)]
Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev
Jason Monk [Tue, 1 Aug 2017 17:21:22 +0000 (17:21 +0000)]
Merge "Merge "Fix QS wifi scan state" into oc-dr1-dev am:
ce099ba8bc am:
9b08d7758b" into oc-mr1-dev-plus-aosp
am:
7256a2763b
Change-Id: Iae3764246fc4114c29b13cdca99e3253a7c7c774
Jason Monk [Tue, 1 Aug 2017 17:08:51 +0000 (17:08 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev am:
ce099ba8bc am:
a18e39e6af
am:
23e1e414c2
Change-Id: I61b1d24860d615b0c7ff53c55b9621fe206928fe
Android Build Merger (Role) [Tue, 1 Aug 2017 17:04:44 +0000 (17:04 +0000)]
Merge "Merge "Fix QS wifi scan state" into oc-dr1-dev am:
ce099ba8bc am:
9b08d7758b" into oc-mr1-dev-plus-aosp
Jason Monk [Tue, 1 Aug 2017 17:01:38 +0000 (17:01 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev am:
ce099ba8bc
am:
a18e39e6af
Change-Id: Ib939563246c8ff709e8c2d5e867548a98f81cc8f
Jason Monk [Tue, 1 Aug 2017 17:01:38 +0000 (17:01 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev am:
ce099ba8bc
am:
9b08d7758b
Change-Id: Iec7997260ffc57eb7016e71189af1854bc8e3015
Jason Monk [Tue, 1 Aug 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
am:
ce099ba8bc
Change-Id: I314e569a00bf8679739f8e25e8eaa6af76c8c5ce
Jason Monk [Tue, 1 Aug 2017 16:51:18 +0000 (16:51 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
am:
ce099ba8bc
Change-Id: Ibd2879449d580e73631e2199b68e78eaae53e788
Jason Monk [Tue, 1 Aug 2017 16:41:43 +0000 (16:41 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
Makoto Onuki [Tue, 1 Aug 2017 16:37:17 +0000 (16:37 +0000)]
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev am:
f6764fb7f7
am:
a843ab3727
Change-Id: I3fd60202b73e6905e14f908f739cb53a8fe722db
Jason Monk [Fri, 28 Jul 2017 18:35:13 +0000 (14:35 -0400)]
Make it easier to click on phone nav buttons
When touches fall through the normal click targets, redirect them
to the nearest view.
Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes:
64080938
Makoto Onuki [Tue, 1 Aug 2017 16:26:14 +0000 (16:26 +0000)]
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
am:
f6764fb7f7
Change-Id: I3cfd72a897157c29d19956be302dbc47cffc03db
Garry Boyer [Tue, 1 Aug 2017 16:22:28 +0000 (16:22 +0000)]
Merge "Privapp permissions inheritance."
Android Build Merger (Role) [Tue, 1 Aug 2017 16:22:10 +0000 (16:22 +0000)]
Merge "Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb am:
18d64cf8fe am:
a91c7c4ad2"
Paul Mclean [Tue, 1 Aug 2017 16:18:54 +0000 (16:18 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb am:
18d64cf8fe
am:
a91c7c4ad2
Change-Id: I4daa8f35014f9cbeb8be13068c70ff2b27134d44
Tony Mantler [Tue, 1 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge changes from topics 'SystemPropPoker', 'DevSettingsPrefsFile'
* changes:
Refactor SystemPropPoker
Remove development settings prefs file
Makoto Onuki [Tue, 1 Aug 2017 16:11:27 +0000 (16:11 +0000)]
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
Paul Mclean [Tue, 1 Aug 2017 16:08:59 +0000 (16:08 +0000)]
Merge "Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb am:
3e62b611f0" into oc-mr1-dev-plus-aosp
am:
a7e1dbbed7
Change-Id: I004ea8867a4dd6fd33078285ac4fc0d7b6202cc7
Bill Yi [Tue, 1 Aug 2017 16:03:13 +0000 (16:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours am:
8d2fceae4a -s ours" into oc-mr1-dev-plus-aosp
am:
672af292c4 -s ours
Change-Id: I804502bb2709e6d37b3afa798c3b7c5002017fb0
Bill Yi [Tue, 1 Aug 2017 16:00:58 +0000 (16:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours am:
08674f3a25 -s ours" into oc-mr1-dev-plus-aosp
am:
db925ec4cd -s ours
Change-Id: I7f35b4130090c0f2f8d0c093268ca5af7fcf7d37
Maggie Lee [Tue, 1 Aug 2017 15:58:40 +0000 (15:58 +0000)]
Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540" into oc-dr1-dev-plus-aosp am:
bd52fdab6b" into oc-mr1-dev-plus-aosp
am:
5e35de9549
Change-Id: I206689ddcc9f551a87cb77b01768c2731f53ab47
Maggie Lee [Tue, 1 Aug 2017 15:56:10 +0000 (15:56 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540 am:
20b54acfa8" into oc-mr1-dev-plus-aosp
am:
8822684604
Change-Id: I90c687066a32163c059b20e0ced8aa90475bacf3
Maggie Lee [Tue, 1 Aug 2017 15:54:05 +0000 (15:54 +0000)]
Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
5e76d54639" into oc-dr1-dev-plus-aosp am:
cb7faac044" into oc-mr1-dev-plus-aosp
am:
8154362fed
Change-Id: I93b0a39d4dde739d08b1b05284351b532c946af0
Paul Mclean [Tue, 1 Aug 2017 15:51:09 +0000 (15:51 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb
am:
18d64cf8fe
Change-Id: I58ccad1327cf6153c5acc8e498aaaa44b8bfd6c6
Andriy Naborskyy [Tue, 1 Aug 2017 15:45:47 +0000 (15:45 +0000)]
Merge changes from topic 'am-
94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp
am:
9352ce7a7d
Change-Id: Iee74aaecac05dac15b2accff5d055210ff218e49
Android Build Merger (Role) [Tue, 1 Aug 2017 15:45:42 +0000 (15:45 +0000)]
Merge "Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb am:
3e62b611f0" into oc-mr1-dev-plus-aosp
Hugo Benichi [Tue, 1 Aug 2017 15:44:25 +0000 (15:44 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours am:
0dbabf02f2 -s ours am:
636750bd98 -s ours
am:
269f8c2e9a -s ours
Change-Id: Ib6a1c59e69e5cd0dfd2ee6853224423f751fd36d
Paul Mclean [Tue, 1 Aug 2017 15:43:51 +0000 (15:43 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am:
f3562ffdfb
am:
3e62b611f0
Change-Id: I4d5c511c043048e79b4846febda85f521fb59f31
Android Build Merger (Role) [Tue, 1 Aug 2017 15:43:03 +0000 (15:43 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours am:
8d2fceae4a -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 15:41:40 +0000 (15:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours am:
08674f3a25 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Tue, 1 Aug 2017 15:41:13 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours
am:
8d2fceae4a -s ours
Change-Id: I841376129cb7ebc1bcccde8d5b82b3b96e657513
Andriy Naborskyy [Tue, 1 Aug 2017 15:41:01 +0000 (15:41 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a am:
5223106231 am:
d387ade2f3
am:
b6b98a17e5
Change-Id: I64568bf38e429cdc739eed4f7f0640216d246345
Bill Yi [Tue, 1 Aug 2017 15:40:03 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
040c26f636 -s ours
am:
08674f3a25 -s ours
Change-Id: I08a17c4bfc3ec26a707b903a7f244a6f9387cc30
Hugo Benichi [Tue, 1 Aug 2017 15:39:53 +0000 (15:39 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours am:
0dbabf02f2 -s ours am:
4dcf4740c4 -s ours
am:
05beeb3bca -s ours
Change-Id: I43c344d9c0a5bcbd14c637079733333b936ca1c6
Android Build Merger (Role) [Tue, 1 Aug 2017 15:35:42 +0000 (15:35 +0000)]
Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540" into oc-dr1-dev-plus-aosp am:
bd52fdab6b" into oc-mr1-dev-plus-aosp
Paul Mclean [Tue, 1 Aug 2017 15:35:05 +0000 (15:35 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am:
f3562ffdfb
Change-Id: I0304bf7c72a340f4bebebea89d2e934ae5830b33
Maggie Lee [Tue, 1 Aug 2017 15:32:57 +0000 (15:32 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540" into oc-dr1-dev-plus-aosp
am:
bd52fdab6b
Change-Id: I44d425037ff844f69669983f84baf2539537f2b1
Android Build Merger (Role) [Tue, 1 Aug 2017 15:32:44 +0000 (15:32 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540 am:
20b54acfa8" into oc-mr1-dev-plus-aosp
Paul Mclean [Tue, 1 Aug 2017 15:32:21 +0000 (15:32 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am:
f3562ffdfb
Change-Id: I7af6e0b15e2a09c636a2d540714bfc5dd2d459f9
Android Build Merger (Role) [Tue, 1 Aug 2017 15:32:09 +0000 (15:32 +0000)]
Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
5e76d54639" into oc-dr1-dev-plus-aosp am:
cb7faac044" into oc-mr1-dev-plus-aosp
Maggie Lee [Tue, 1 Aug 2017 15:31:16 +0000 (15:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540
am:
20b54acfa8
Change-Id: Ie25d37fa283f37924e07caf9ed0cfb850e2c710d
OSDN Git Service
