git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Lei Yu [Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 22:07:34 +0000 (22:07 +0000)]

Copy smearing method to BatteryStatsHelper am: 5dad8068e2
am: 5047d7bf7f -s ours

Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:59:27 +0000 (21:59 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: bd499f9319

Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7

commit | commitdiff | tree

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

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2 -s ours

Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 21:17:14 +0000 (21:17 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9

commit | commitdiff | tree

jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]

Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]

Merge "Add IApnSourceService.aidl" into oc-dr1-dev

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]

Merge changes from topic 'battery_smear_move' into oc-dev

* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]

Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]

Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 19:04:48 +0000 (19:04 +0000)]

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f
am: 7b78a176a9

Change-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Fri, 9 Jun 2017 17:50:44 +0000 (17:50 +0000)]

Merge "Removing legacy default thumbnail logic." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lei Yu [Fri, 9 Jun 2017 17:46:26 +0000 (17:46 +0000)]

Merge "Copy smearing method to BatteryStatsHelper" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 17:33:56 +0000 (17:33 +0000)]

Merge "Add IApnSourceService.aidl"
am: 1d5d409f6f

Change-Id: Id76c6c83d18482594730f7e584231f7f4714b46d

commit | commitdiff | tree

Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]

Merge "Replace fonts of unknown origin" into oc-dev

commit | commitdiff | tree

Jordan Liu [Fri, 9 Jun 2017 17:25:08 +0000 (17:25 +0000)]

Merge "Add IApnSourceService.aidl"

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Fri, 9 Jun 2017 16:57:44 +0000 (16:57 +0000)]

Merge "Add notification listener plugin hook" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]

Merge "Fix the finding logic of MediaButtonSession" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]

Merge "Fix deadlock when create alert window notification" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 11:40:01 +0000 (11:40 +0000)]

Merge "Revert "Instrument captive portal login activity""
am: 2921320517

Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 11:31:21 +0000 (11:31 +0000)]

Merge "Revert "Instrument captive portal login activity""

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 11:30:05 +0000 (11:30 +0000)]

Revert "Instrument captive portal login activity"

This reverts commit f867da14eaa194cb53b0726b50e570268e70f1d7.

Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Jun 2017 11:27:21 +0000 (11:27 +0000)]

Merge "Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde am: d1e55c133d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Bryce Lee [Fri, 9 Jun 2017 11:25:07 +0000 (11:25 +0000)]

Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde
am: d1e55c133d

Change-Id: I20352302ad5d8691993547214a92956d9c182cf3

commit | commitdiff | tree

Bryce Lee [Fri, 9 Jun 2017 11:25:02 +0000 (11:25 +0000)]

Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde
am: cbf1bd40ea

Change-Id: I5770bf1ed814ba03bad9a08c0cf59151aef34100

commit | commitdiff | tree

Bryce Lee [Fri, 9 Jun 2017 11:18:04 +0000 (11:18 +0000)]

Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: I78c8fc62d4050546896262245785084fd5cab609

commit | commitdiff | tree

Bryce Lee [Fri, 9 Jun 2017 11:17:58 +0000 (11:17 +0000)]

Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12

commit | commitdiff | tree

Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]

Merge "Prioritize reused activity's stack over computed stack." into oc-dev

commit | commitdiff | tree

Erik Kline [Fri, 9 Jun 2017 09:31:05 +0000 (09:31 +0000)]

Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60 am: ad3fd82f8b
am: b9fc817f59

Change-Id: I178130e65db4fef26d62ea7eaa9a52f7e8103432

commit | commitdiff | tree

Erik Kline [Fri, 9 Jun 2017 09:23:37 +0000 (09:23 +0000)]

Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60
am: ad3fd82f8b

Change-Id: Ib1f41df1200378191c0722a280939ccbde539920

commit | commitdiff | tree

Erik Kline [Fri, 9 Jun 2017 09:16:01 +0000 (09:16 +0000)]

Merge "Convert IControlsTethering from interface into callback"
am: 5b9d362b60

Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3

commit | commitdiff | tree

Erik Kline [Fri, 9 Jun 2017 09:06:39 +0000 (09:06 +0000)]

Merge "Convert IControlsTethering from interface into callback"

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 07:24:42 +0000 (07:24 +0000)]

Merge "Instrument captive portal login activity" am: b213053def am: 30b7dfb526
am: d614cd3509 -s ours

Change-Id: I71166b2679994e342ca72398c68f6751ee2d5fa3

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 07:16:18 +0000 (07:16 +0000)]

Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc am: 75792d4299 -s ours
am: 97520fb0dd -s ours

Change-Id: Ia8e70a92b70cc1321024156c5a8879352827d567

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 07:11:46 +0000 (07:11 +0000)]

Merge "Instrument captive portal login activity" am: b213053def
am: 30b7dfb526

Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 07:08:25 +0000 (07:08 +0000)]

Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc
am: 75792d4299 -s ours

Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 06:50:52 +0000 (06:50 +0000)]

Merge "Instrument captive portal login activity"
am: b213053def

Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 06:47:47 +0000 (06:47 +0000)]

Merge "New Metrics constants for captive portal related UI"
am: aac9aff5dc

Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2

commit | commitdiff | tree

Romain Guy [Fri, 9 Jun 2017 06:40:44 +0000 (06:40 +0000)]

Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
am: c025347cf2

Change-Id: I67be64383eeac28ea84ae02a351a92d078b4dac8

commit | commitdiff | tree

Hugo Benichi [Fri, 9 Jun 2017 06:39:19 +0000 (06:39 +0000)]

Merge "Instrument captive portal login activity"