OSDN Git Service
jackqdyulei [Fri, 9 Jun 2017 22:08:02 +0000 (22:08 +0000)]
Copy smearing method to BatteryStatsHelper am:
5dad8068e2 -s ours am:
6d1e7537f3 -s ours
am:
7bfcc80251 -s ours
Change-Id: I2d0b35a01e0a3cda7d521e51957c5cc06c4f6bd8
jackqdyulei [Fri, 9 Jun 2017 21:58:06 +0000 (21:58 +0000)]
Copy smearing method to BatteryStatsHelper am:
5dad8068e2 -s ours
am:
6d1e7537f3 -s ours
Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371
Felipe Leme [Fri, 9 Jun 2017 21:54:24 +0000 (21:54 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c am:
6890569c04" into oc-dr1-dev-plus-aosp
am:
ee3797a163
Change-Id: Ic77250f3a3ce14168cfe872da38b443f8792ed6b
Android Build Merger (Role) [Fri, 9 Jun 2017 21:45:31 +0000 (21:45 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c am:
b32c05a36a am:
768bfff308"
Roozbeh Pournader [Fri, 9 Jun 2017 21:44:42 +0000 (21:44 +0000)]
Merge "Get underline position and thickness from the font"
Felipe Leme [Fri, 9 Jun 2017 21:43:56 +0000 (21:43 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c am:
b32c05a36a
am:
768bfff308
Change-Id: Ifaa9318d0103e8c0f75b13668026b7fd7ac53e14
jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]
Copy smearing method to BatteryStatsHelper
am:
5dad8068e2 -s ours
Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100
Felipe Leme [Fri, 9 Jun 2017 21:35:58 +0000 (21:35 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4 am:
d66af648c2
am:
cb334c7d33
Change-Id: I74ec7f54702297a95c6239a9c30ae866bf01e021
Chen Xu [Fri, 9 Jun 2017 21:32:45 +0000 (21:32 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3 am:
25c1a060bc
am:
efd4097848
Change-Id: I23d06da1724e03b6f7daf06f22d776e5fb69af4b
Android Build Merger (Role) [Fri, 9 Jun 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c am:
6890569c04" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 21:30:31 +0000 (21:30 +0000)]
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4 am:
0425f9ceea" into oc-dr1-dev-plus-aosp
am:
18de66783a
Change-Id: Ia323d2afd97c97d72f1207a3d37a8989d1098a2c
Felipe Leme [Fri, 9 Jun 2017 21:28:01 +0000 (21:28 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c
am:
6890569c04
Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c
Felipe Leme [Fri, 9 Jun 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am:
8db148093c
am:
b32c05a36a
Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5
Chen Xu [Fri, 9 Jun 2017 21:27:31 +0000 (21:27 +0000)]
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3 am:
fce339c49c" into oc-dr1-dev-plus-aosp
am:
385f581ffd
Change-Id: I745d3213d8db86dad2a9779f5c51b6c1ed463719
Hemant Gupta [Fri, 9 Jun 2017 21:20:18 +0000 (21:20 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574 am:
e2ac2e20d6
am:
afc9832a1d
Change-Id: Ifb8c22cdb936a76d1a9408228375461909c95369
Felipe Leme [Fri, 9 Jun 2017 21:20:09 +0000 (21:20 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4
am:
d66af648c2
Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f
Jordan Liu [Fri, 9 Jun 2017 21:14:11 +0000 (21:14 +0000)]
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am:
49444fc090 -s ours" into oc-dr1-dev-plus-aosp
am:
51fb4488f5 -s ours
Change-Id: I05a157e758009cbc261f08cf5f492111e2b2de2e
Chen Xu [Fri, 9 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3
am:
25c1a060bc
Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b
Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a
Android Build Merger (Role) [Fri, 9 Jun 2017 21:10:19 +0000 (21:10 +0000)]
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4 am:
0425f9ceea" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 21:09:29 +0000 (21:09 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am:
e4835a2af4
am:
0425f9ceea
Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9
Android Build Merger (Role) [Fri, 9 Jun 2017 21:08:59 +0000 (21:08 +0000)]
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3 am:
fce339c49c" into oc-dr1-dev-plus-aosp
Hemant Gupta [Fri, 9 Jun 2017 21:07:38 +0000 (21:07 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574 am:
b99484cc61
am:
3f6bb65808
Change-Id: I4b05ce913154888e14a2d4940cf9836a79ee89b6
Chen Xu [Fri, 9 Jun 2017 21:06:48 +0000 (21:06 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:
cdec393aa3
am:
fce339c49c
Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207
Hemant Gupta [Fri, 9 Jun 2017 21:06:09 +0000 (21:06 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574
am:
e2ac2e20d6
Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046
Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am:
8db148093c
Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76
Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5
Android Build Merger (Role) [Fri, 9 Jun 2017 21:02:45 +0000 (21:02 +0000)]
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am:
49444fc090 -s ours" into oc-dr1-dev-plus-aosp
Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
Hemant Gupta [Fri, 9 Jun 2017 21:00:03 +0000 (21:00 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am:
6f2b75f574
am:
b99484cc61
Change-Id: I701377a315a73eb918f8e42129a401072733cb71
Jordan Liu [Fri, 9 Jun 2017 20:59:54 +0000 (20:59 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
am:
49444fc090 -s ours
Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d
Felipe Leme [Fri, 9 Jun 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am:
e4835a2af4
Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a
Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
Chen Xu [Fri, 9 Jun 2017 20:57:02 +0000 (20:57 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am:
cdec393aa3
Change-Id: I657161b898c66efdf13c48c322e25cefc7733750
TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
Hemant Gupta [Fri, 9 Jun 2017 20:50:16 +0000 (20:50 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am:
6f2b75f574
Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69
Jeff Sharkey [Fri, 9 Jun 2017 20:37:38 +0000 (20:37 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev am:
c017d299ce
am:
00c66f676f
Change-Id: I200f39ef3dd3c336abd48e53a9b93e21f48a7dc0
Jeff Sharkey [Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
am:
c017d299ce
Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c
Garry Boyer [Fri, 9 Jun 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Enables child APKs, fixes a package parsing bug, and adds tests."
Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Jordan Liu [Fri, 9 Jun 2017 20:08:42 +0000 (20:08 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f am:
7b78a176a9 am:
b699e98285
am:
da7fe3f117 -s ours
Change-Id: I7ccd76d80556dd76626e429a868f6b32f19e3fb9
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Jordan Liu [Fri, 9 Jun 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f am:
7b78a176a9
am:
b699e98285
Change-Id: Ib0d3d447d6058cbc6e348f76e55429627a917591
Jordan Liu [Fri, 9 Jun 2017 19:04:48 +0000 (19:04 +0000)]
Merge "Add IApnSourceService.aidl" am:
1d5d409f6f
am:
7b78a176a9
Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a
Pankaj Kanwar [Fri, 9 Jun 2017 18:46:19 +0000 (18:46 +0000)]
Merge "Adding fields in Telephony.java to support the CarrierProvider. Needed for ImsiEncryption."
Hemant Gupta [Sat, 17 Oct 2015 14:10:53 +0000 (19:40 +0530)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
Add required OBEX application parameters TAGID's and length
declarations required to support PBAP 1.2 specification.
Test: Connected with Remote PBAP Client supporting PBAP 1.2 and
verified that connection and transfer happens over L2CAP.
Connected with Remote PBAP Client supporting PBAP 1.1 and
and verified that connection and transfer happens over RFCOMM.
TestTracker: 89053
Bug:
33011817
Change-Id: I8a772b0dddf6ecf74b057e12d7596421c0e0f558
(cherry picked from commit
9e91b62c1fa4f6c51f53ddb3f2155f345be30a2a)
Winson Chung [Fri, 9 Jun 2017 18:12:54 +0000 (18:12 +0000)]
Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335 am:
fc926a938e" into oc-dr1-dev-plus-aosp
am:
70bc6258fd
Change-Id: Ibb21bff953a35d07c78ff26678ea2c173eb15560
Winson Chung [Fri, 9 Jun 2017 18:09:06 +0000 (18:09 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335 am:
d6e3001770
am:
81ca14d751
Change-Id: I2bfa25f16bfc25b6c4202e247ce0c73746c54366
Android Build Merger (Role) [Fri, 9 Jun 2017 18:04:54 +0000 (18:04 +0000)]
Merge "Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335 am:
fc926a938e" into oc-dr1-dev-plus-aosp
Lei Yu [Fri, 9 Jun 2017 18:03:56 +0000 (18:03 +0000)]
Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev am:
02ece2f486
am:
35aa7879be
Change-Id: Ia67b467eee2cea695914d8d021a172c0059961db
Winson Chung [Fri, 9 Jun 2017 18:03:04 +0000 (18:03 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335
am:
fc926a938e
Change-Id: I7a59633e9850083816c2dbdaffcc50b7908fa80d
Winson Chung [Fri, 9 Jun 2017 18:02:03 +0000 (18:02 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev am:
a0e44e7335
am:
d6e3001770
Change-Id: I9b7572f08a3b67bf886aa06d02e00a960529aa9b
Clara Bayarri [Fri, 9 Jun 2017 18:01:49 +0000 (18:01 +0000)]
Merge "Merge "Replace fonts of unknown origin" into oc-dev am:
3eae564fec am:
e9261d2b84" into oc-dr1-dev-plus-aosp
am:
0d62772fa8
Change-Id: I119bb6fb352d6c5ef60a3dda1143ec68eea13f13
Winson Chung [Fri, 9 Jun 2017 17:56:26 +0000 (17:56 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am:
a0e44e7335
Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
Winson Chung [Fri, 9 Jun 2017 17:55:08 +0000 (17:55 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
am:
a0e44e7335
Change-Id: I39c832f1ff5b0905bb497c3970c4ce40dad237b8
Lei Yu [Fri, 9 Jun 2017 17:52:41 +0000 (17:52 +0000)]
Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
am:
02ece2f486
Change-Id: I395712265d3d159c26c4f69f2a7abdfe31398aff
Clara Bayarri [Fri, 9 Jun 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev am:
3eae564fec am:
f93c97f73e
am:
f26d11f169
Change-Id: I6e758e25deb2325f1383c2df6e2e12e0caf86a87
Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Removing legacy default thumbnail logic." into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 17:49:19 +0000 (17:49 +0000)]
Merge "Merge "Replace fonts of unknown origin" into oc-dev am:
3eae564fec am:
e9261d2b84" into oc-dr1-dev-plus-aosp
Clara Bayarri [Fri, 9 Jun 2017 17:47:03 +0000 (17:47 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev am:
3eae564fec
am:
e9261d2b84
Change-Id: Id70541af980dd26e2d5d3cb80f87690e6b50e717
Lei Yu [Fri, 9 Jun 2017 17:46:26 +0000 (17:46 +0000)]
Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev
Clara Bayarri [Fri, 9 Jun 2017 17:46:31 +0000 (17:46 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev am:
3eae564fec
am:
f93c97f73e
Change-Id: I600bc887488ddba6500c9be170f524e67fd15d62
Jordan Liu [Tue, 23 May 2017 20:07:07 +0000 (13:07 -0700)]
Add IApnSourceService.aidl
This service is bound to by TelephonyProvider on devices where we don't
use the apns-conf.xml file.
Bug:
37283190
Test: manual
Change-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Merged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508
Clara Bayarri [Fri, 9 Jun 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am:
3eae564fec
Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba
Clara Bayarri [Fri, 9 Jun 2017 17:37:58 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am:
3eae564fec
Change-Id: Ied313294ca2de00f654e0c912717286f2725cc18
Jordan Liu [Fri, 9 Jun 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Add IApnSourceService.aidl"
am:
1d5d409f6f
Change-Id: Id76c6c83d18482594730f7e584231f7f4714b46d
Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
Jordan Liu [Fri, 9 Jun 2017 17:25:08 +0000 (17:25 +0000)]
Merge "Add IApnSourceService.aidl"
Jason Monk [Fri, 9 Jun 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev am:
8f8b5ac031
am:
05ac6544c9
Change-Id: I30313673df89ae8a60d4da5b1da62bceb35430d3
Jason Monk [Fri, 9 Jun 2017 17:03:28 +0000 (17:03 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev
am:
8f8b5ac031
Change-Id: Id40b6acf8e144c92ea4cb9a3604bc798d3c51e8b
Jason Monk [Fri, 9 Jun 2017 16:57:44 +0000 (16:57 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev
Bill Yi [Fri, 9 Jun 2017 16:29:41 +0000 (16:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
728c610446 -s ours am:
b059f0bc3d -s ours" into oc-dr1-dev-plus-aosp
am:
425a958770 -s ours
Change-Id: I11040add74c0145a8ff1cda297d6292387692169
Bill Yi [Fri, 9 Jun 2017 16:20:55 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
728c610446 -s ours am:
1de3fd81e0 -s ours
am:
de19b85c6c -s ours
Change-Id: I2db346eda1e5abd2ddfffc6b19fc5c5eae1d3f57
Android Build Merger (Role) [Fri, 9 Jun 2017 16:17:17 +0000 (16:17 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
728c610446 -s ours am:
b059f0bc3d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 9 Jun 2017 16:14:49 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
728c610446 -s ours
am:
b059f0bc3d -s ours
Change-Id: I63dbf1618312c7a36b6d551bc4df29e24b8f9dff
Bill Yi [Fri, 9 Jun 2017 16:14:45 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
728c610446 -s ours
am:
1de3fd81e0 -s ours
Change-Id: I4481d8b44aa5b37e131cffb813b4aebf9a77b681
Bill Yi [Fri, 9 Jun 2017 16:10:02 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
728c610446 -s ours
Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa
Bill Yi [Fri, 9 Jun 2017 16:08:19 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
728c610446 -s ours
Change-Id: I6b15bd645c0d70a710a45e213a95066e93be50b1
Sungsoo Lim [Fri, 9 Jun 2017 16:02:47 +0000 (16:02 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev am:
9cfd30202d am:
3997797998
am:
07c9c4483c
Change-Id: I4ef4ea53296d0c5223c58277e854d9950455936a
TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:55:21 +0000 (15:55 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev am:
9cfd30202d am:
acd925d497
am:
1ff6d52bd2
Change-Id: I88a42005d35187447ca5a8774e67356adcee02b7
Sungsoo Lim [Fri, 9 Jun 2017 15:53:32 +0000 (15:53 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev am:
9cfd30202d
am:
3997797998
Change-Id: I7663e1a9755eaa79eecd3d6c808047349aa72b36
Sungsoo Lim [Fri, 9 Jun 2017 15:49:48 +0000 (15:49 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev am:
9cfd30202d
am:
acd925d497
Change-Id: I2e1fe0367a3fe06110cf28c297422cfe07c374c8
Sungsoo Lim [Fri, 9 Jun 2017 15:44:33 +0000 (15:44 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I4de9857958f30cfa251da56d20c07fcca8973d95
Sungsoo Lim [Fri, 9 Jun 2017 15:42:50 +0000 (15:42 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
Bill Yi [Fri, 9 Jun 2017 14:01:59 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
Wale Ogunwale [Fri, 9 Jun 2017 13:33:37 +0000 (13:33 +0000)]
Merge "Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383 am:
d5418a231b" into oc-dr1-dev-plus-aosp
am:
dbeaae883c
Change-Id: I0eacee0bfafe912133c3cbb7e7a17ddfacaa2725
Wale Ogunwale [Fri, 9 Jun 2017 13:31:15 +0000 (13:31 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383 am:
59cd5a98dc
am:
3692e73964
Change-Id: I73608ceef0c56bf08eff107fe0186c581dcadd0d
Android Build Merger (Role) [Fri, 9 Jun 2017 13:25:00 +0000 (13:25 +0000)]
Merge "Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383 am:
d5418a231b" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 9 Jun 2017 13:23:13 +0000 (13:23 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383
am:
d5418a231b
Change-Id: I48aadf1444ce14bbff67894fdb0a6fdf1dbb2ecf
Wale Ogunwale [Fri, 9 Jun 2017 13:23:09 +0000 (13:23 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev am:
678477b383
am:
59cd5a98dc
Change-Id: I00b769b3bce0ca6851001a84f4c53c16f5094c6c
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 12:17:41 +0000 (12:17 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517 am:
bbddbfc451 am:
56057f2b55 -s ours
am:
24fa587ed7
Change-Id: I05ec98c49e4c7242d75f867363f1dbf033f1a022
Hugo Benichi [Fri, 9 Jun 2017 12:10:15 +0000 (12:10 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517 am:
bbddbfc451
am:
56057f2b55 -s ours
Change-Id: I22d9980ace64235c8b88417bb4b818a13cbb65e0
Hugo Benichi [Fri, 9 Jun 2017 11:47:25 +0000 (11:47 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517
am:
bbddbfc451
Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df
OSDN Git Service
