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

Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:19 +0000 (20:33 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp am: 0efb0644fc"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:33:07 +0000 (20:33 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:31:23 +0000 (20:31 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 0efb0644fc

Change-Id: I9d46f6356833f384470fe4f02022e67c3937409d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:30:47 +0000 (20:30 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp am: 0dda017310"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:30:46 +0000 (20:30 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:29:59 +0000 (20:29 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:29:02 +0000 (20:29 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 0dda017310

Change-Id: I54c1be96f0c5521505f1f2f19103ccf3605e99f2

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:28:48 +0000 (20:28 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:32 +0000 (20:28 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:28:04 +0000 (20:28 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:26:33 +0000 (20:26 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 1647883e9b

Change-Id: I0587e3a021d4b0d36abb4971907a2faaea97b74e

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:26:14 +0000 (20:26 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 1647883e9b

Change-Id: I39f3249969f21855e6a0088ac5fd4b4aa8a778b0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:25:49 +0000 (20:25 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:25:29 +0000 (20:25 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:24:14 +0000 (20:24 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 771a872178

Change-Id: Ia03a2a3a5f7675fc4ee88c1fb8cf64f91468c186

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:24:02 +0000 (20:24 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 771a872178

Change-Id: Iffc87ee2b889302f0cd011f8a07ef19e6c6f916d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:23:41 +0000 (20:23 +0000)]

Merge "Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp am: 5ca73a0f98"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:23:28 +0000 (20:23 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:21:56 +0000 (20:21 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp
am: 5ca73a0f98

Change-Id: I2fc2bd394637aae37b95be3f132bd98100497f4f

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 20:21:31 +0000 (20:21 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 20:21:22 +0000 (20:21 +0000)]

Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp am: 644c0a2690"

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 20:20:13 +0000 (20:20 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp
am: 644c0a2690

Change-Id: Ief370d2eefa32003ff9809c0a36f972847bc645b

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 20:20:06 +0000 (20:20 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp
am: 644c0a2690

Change-Id: If1aa06332c6884bebdbb2027464fd4603c12757f

commit | commitdiff | tree

Phil Weaver [Thu, 6 Jul 2017 20:06:57 +0000 (20:06 +0000)]

Merge "Don't display new suppressed overlays"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 20:01:21 +0000 (20:01 +0000)]

Merge "Don't clobber application's strict mode"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 19:50:43 +0000 (19:50 +0000)]

Merge "Respect locale direction in TimePicker AM/PM location"

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 19:41:29 +0000 (19:41 +0000)]

Merge "Add tracing for UserState and a few services."

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 19:33:59 +0000 (19:33 +0000)]

Merge "Change storage migration to use quota APIs."

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:08:35 +0000 (19:08 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b am: 6e6b4f713f"

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 19:07:38 +0000 (19:07 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b
am: 6e6b4f713f

Change-Id: Iaf49a6db40f8f5c9b50929370319db796730d147

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:07:09 +0000 (19:07 +0000)]

Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: d6bb9401eb am: f888e4248a"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:06:43 +0000 (19:06 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b am: 6e6b4f713f"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:05:49 +0000 (19:05 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: d6bb9401eb
am: f888e4248a

Change-Id: If18658ae2273eb5f1681b18584cf75827b954ce5

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 19:05:27 +0000 (19:05 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b
am: 6e6b4f713f

Change-Id: I699b77d13cbb759ea1d06b4db048fb9a68b0f579

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:05:15 +0000 (19:05 +0000)]

Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: f035f800b7 am: 6b4b8e50c5"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:05:00 +0000 (19:05 +0000)]

Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: d6bb9401eb am: f888e4248a"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:03:43 +0000 (19:03 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp am: f035f800b7
am: 6b4b8e50c5

Change-Id: If18e1bc0e96bca4ba6cbefdf7a96b5524567dc49

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:03:33 +0000 (19:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 19:03:19 +0000 (19:03 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp am: 6c6b3820f7 am: 40e4512ad6"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:01:53 +0000 (19:01 +0000)]

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:01:37 +0000 (19:01 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp am: 6c6b3820f7
am: 40e4512ad6

Change-Id: I46ebc84f9f34db6a5e78c24997bba5324ced8b17

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 19:00:21 +0000 (19:00 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp am: 6c6b3820f7
am: 40e4512ad6

Change-Id: I129746e6ab18e6f433f6a8500773b2d5a7290b56

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:56:59 +0000 (18:56 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:55:08 +0000 (18:55 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp
am: 60ec77baf9

Change-Id: Id578e3661709d57cee33484671e66dbe8b23f687

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:54:49 +0000 (18:54 +0000)]

Merge "Return result when set tile enabled/disabled"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:54:17 +0000 (18:54 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:53:36 +0000 (18:53 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:53:16 +0000 (18:53 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: b91a596c9b

Change-Id: I6771283cdf4e8bd9f7644a325a31a6ea6fe76001

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:52:04 +0000 (18:52 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp
am: 60ec77baf9

Change-Id: I7b838c599027ae365b92fd2fe06f2ef3e9599117

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:51:30 +0000 (18:51 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:49:59 +0000 (18:49 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: b91a596c9b

Change-Id: I7b21ffc84d7c53ae68ae3ca61b3bcca107df141d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:49:29 +0000 (18:49 +0000)]

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: af3c9615f1" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:27 +0000 (18:48 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48 am: 16ff7bc82a"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:03 +0000 (18:48 +0000)]

Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am: f259a1975b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:47:57 +0000 (18:47 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: af3c9615f1

Change-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:47:55 +0000 (18:47 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48 am: 16ff7bc82a"

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:47:19 +0000 (18:47 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48
am: 16ff7bc82a

Change-Id: Id82a5e5c874c6fe4a24d5e3f9b095f208fc60533

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 18:47:09 +0000 (18:47 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b

Change-Id: Ie16f4282d3881bc7f306d55aacc7c9f0585a1be0

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:47:00 +0000 (18:47 +0000)]

Merge "Include value of allowBackup in "dumpsys wallpaper""

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:46:54 +0000 (18:46 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517 am: aee5787b48
am: 16ff7bc82a

Change-Id: Icf006b580ff47125e992fd208a89b909dd53e639

commit | commitdiff | tree

Hiroki Yamamoto [Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am: f259a1975b

Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:42:05 +0000 (18:42 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:41:48 +0000 (18:41 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: d6bb9401eb

Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:40:45 +0000 (18:40 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 7e97085ee7

Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:40:20 +0000 (18:40 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp
am: f035f800b7

Change-Id: I4cd47fea5a6e32d166295374ce3e5a898fe57110

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:39:03 +0000 (18:39 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:38:57 +0000 (18:38 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp
am: 6c6b3820f7

Change-Id: Ic03a469684e57e6c703d55cef69bedd6eabd1664

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:38:02 +0000 (18:38 +0000)]

Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:37:59 +0000 (18:37 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 4c3be35123

Change-Id: I7a352def470a54916129fb9fc90239658847a02f

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:37:34 +0000 (18:37 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517
am: aee5787b48

Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:36:42 +0000 (18:36 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 4c3be35123

Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 18:35:25 +0000 (18:35 +0000)]

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]

Merge "Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master am: 785ab04d7a" into oc-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master
am: 785ab04d7a

Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27 am: 481d92c517" into oc-dev-plus-aosp

commit | commitdiff | tree

Kurt Nelson [Fri, 30 Jun 2017 00:20:56 +0000 (17:20 -0700)]

Don't clobber application's strict mode

Applications often configure strict mode in Application.onCreate. A
regression was added in I2614f8bb30203e00953b1978bbcaf24d84d0397b that
applied a strict mode override for a longer period of time than needed.

Test: Launched a few applications
Bug: 36951662
Change-Id: I30b3eafa4a833fc42d0a938da9446007ade80480

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]

Merge "Fix ContentObserver unregister issue" am: 09b6988e27
am: 481d92c517

Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31

commit | commitdiff | tree

Daniel Nishi [Thu, 6 Jul 2017 18:29:53 +0000 (18:29 +0000)]

Merge "Add a Setting for whether or not we have been disabled by policy."

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:26:39 +0000 (18:26 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:24:49 +0000 (18:24 +0000)]

Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: Ied8d6168fc625600c865c1980bb82da0f919e02b

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]

Merge "Add a reason arg to streamStateUpdated"
am: 6ba3829074

Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]

Merge "Merge "Fix ContentObserver unregister issue" am: 09b6988e27" into stage-aosp-master

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396

commit | commitdiff | tree

Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]

Merge "Fix ContentObserver unregister issue"
am: 09b6988e27

Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:18:58 +0000 (18:18 +0000)]

Merge "Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp am: 8d1471aebe"

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:17:19 +0000 (18:17 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp
am: 8d1471aebe

Change-Id: I04fb9e7ca25320454f9a51b45a4cbe3931908d18

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:16:41 +0000 (18:16 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7 am: 1ea58e5016"

commit | commitdiff | tree

Scott Randolph [Thu, 6 Jul 2017 18:16:27 +0000 (18:16 +0000)]

Merge "Fix typo in AudioPolicy comments"

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:15:07 +0000 (18:15 +0000)]

Merge "Password field colors" into oc-dr1-dev am: e21a151fe7
am: 1ea58e5016

Change-Id: I9e0551fc0ec8d17fa92f9e40679b2c2956566f97

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:14:31 +0000 (18:14 +0000)]

Merge "Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp am: d88cfb5345"

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:13:25 +0000 (18:13 +0000)]

Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp
am: d88cfb5345

Change-Id: I3dd45ecf89eedafcc99707b99b77ab7448532d1f

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:10:37 +0000 (18:10 +0000)]

Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c" into oc-dr1-dev-plus-aosp
am: d88cfb5345

Change-Id: I7419f044c4f2c3b04b10b563661a4984496043d6

commit | commitdiff | tree

Adrian Roos [Thu, 6 Jul 2017 18:08:36 +0000 (18:08 +0000)]

Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am: 92b6b7090c
am: fd9d88beb3

Change-Id: I76a5fdc6db9a849eeacf47278391e5d7eae53fc2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 18:08:32 +0000 (18:08 +0000)]

Merge "Merge "Password field colors" into oc-dr1-dev am: e21a151fe7" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]

Merge "Add a reason arg to streamStateUpdated"

commit | commitdiff | tree

Lucas Dupin [Thu, 6 Jul 2017 18:07:42 +0000 (18:07 +0000)]

Merge "Password field colors" into oc-dr1-dev
am: e21a151fe7

Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b