OSDN Git Service
Andrew Solovay [Tue, 1 Aug 2017 21:46:46 +0000 (21:46 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
am:
ce4d45e399
Change-Id: I64fd78a2730cdb2565c56bdf75938029f4c3df75
Android Build Merger (Role) [Tue, 1 Aug 2017 21:43:41 +0000 (21:43 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
d4b1a0985b am:
517927fa1a" into oc-mr1-dev-plus-aosp
Andrew Solovay [Tue, 1 Aug 2017 21:39:34 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
d4b1a0985b
am:
517927fa1a
Change-Id: I0c4515a1abd0d58b81fd0d4090a609507436ee4c
Andrew Solovay [Tue, 1 Aug 2017 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc
am:
6ff61dbc51
Change-Id: I641281f7430fe2d9c168bf2eddbdcba6803dff96
Android Build Merger (Role) [Tue, 1 Aug 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
Andrew Solovay [Tue, 1 Aug 2017 21:32:05 +0000 (21:32 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28
Andrew Solovay [Tue, 1 Aug 2017 21:31:59 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: I9b6e9c02f2237c48fdac4fd6f0c4afc4eb8b03cd
Andrew Solovay [Tue, 1 Aug 2017 21:31:58 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
d4b1a0985b
Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4
Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c
Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04
Ruchi Kandoi [Tue, 1 Aug 2017 21:14:12 +0000 (21:14 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847 am:
e6a08439b6
am:
49dc055ae6
Change-Id: I7ea323c190ee7535575b5dde82ebdc7a8234b0db
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Lucas Dupin [Tue, 1 Aug 2017 21:04:39 +0000 (21:04 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
am:
34c949d2dc
Change-Id: I2acce419f4fb34a0b2d9ae46680c4acbbad60668
Ruchi Kandoi [Tue, 1 Aug 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847
am:
e6a08439b6
Change-Id: I80df7df67afa1e9a7dd4071d3005ef2e1ed0c004
Ruchi Kandoi [Tue, 1 Aug 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755
am:
1decea7847
Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef
Lucas Dupin [Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
Previr Rangroo [Tue, 1 Aug 2017 20:49:18 +0000 (20:49 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
am:
2ca4449d6b
Change-Id: I164e07c43d0538835759e734cea871503431ceb9
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am:
7770adf755
Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc
Love Khanna [Tue, 1 Aug 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am:
756d93964d
am:
1ce17014ce
Change-Id: I2171884ee232c3a94e9f764a516dcb1e302789fc
Dianne Hackborn [Tue, 1 Aug 2017 20:32:19 +0000 (20:32 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" into oc-mr1-dev
am:
47e6cc34bb
Change-Id: I8777f2dc71392fadfce534b1323e0f8ec8601427
TreeHugger Robot [Tue, 1 Aug 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Adam Cohen [Tue, 1 Aug 2017 20:27:07 +0000 (20:27 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am:
0151c395b5
am:
537c9c407e
Change-Id: Icf80d49a1541f57afcf77d4e7a59771f485ad47b
Love Khanna [Tue, 1 Aug 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am:
756d93964d
am:
7d8f6ab8e1
Change-Id: Ibb31cfee564cb74b23fdd2fd613829209e600500
Android Build Merger (Role) [Tue, 1 Aug 2017 20:16:06 +0000 (20:16 +0000)]
Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d am:
d789b7b99f" into oc-mr1-dev-plus-aosp
Jason Monk [Tue, 1 Aug 2017 20:12:44 +0000 (20:12 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am:
7d08ca6e4d
am:
d789b7b99f
Change-Id: I1797d5fb9806f403ca113774382ed94d28f78f5d
Adam Cohen [Tue, 1 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am:
0151c395b5
am:
06a108c297
Change-Id: I45139ffa0da676ed80147f474d757600b725f585
Love Khanna [Tue, 1 Aug 2017 20:07:57 +0000 (20:07 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am:
756d93964d
Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897
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
Love Khanna [Tue, 1 Aug 2017 20:03:44 +0000 (20:03 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am:
756d93964d
Change-Id: Idf050b3f7a144a5074b33677269305d9eadd312d
Dianne Hackborn [Tue, 1 Aug 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Fix issue #
64224738: Document return value of IBinder.transact()" into oc-mr1-dev
Adam Cohen [Tue, 1 Aug 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am:
0151c395b5
Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1
Adam Cohen [Tue, 1 Aug 2017 19:56:04 +0000 (19:56 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am:
0151c395b5
Change-Id: I2ae775926cdd52e2e0fb00cd2c2fb2b7dc92e863
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
Jason Monk [Tue, 1 Aug 2017 19:52:08 +0000 (19:52 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am:
7d08ca6e4d
Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
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:48:12 +0000 (19:48 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 19:46:29 +0000 (19:46 +0000)]
Merge "Log package parse timings" into oc-mr1-dev
Adam Cohen [Tue, 1 Aug 2017 19:41:42 +0000 (19:41 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
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
Felipe Leme [Tue, 1 Aug 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev
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
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
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
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
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
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
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
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
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
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
Tomasz Wasilczyk [Tue, 1 Aug 2017 17:43:02 +0000 (17:43 +0000)]
Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
Lucas Dupin [Tue, 1 Aug 2017 17:36:10 +0000 (10:36 -0700)]
Volume slider content description
Volume, ring and acessibility sliders now report their names
when talk back is on.
Examples:
26% acessibility seek control, use volume keys to adjust.
0% ring seek control, disabled.
Change-Id: I0a775a9b90254c9f338b9f4f38efbff10f626853
Fixes:
62354047
Test: Turn talk back on, tap on volume sliders
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
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit
20a77e973f62f145ab7b3a4822ce34407c0ca476)
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
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
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
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 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
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
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
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
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