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

Android Build Merger (Role) [Fri, 7 Jul 2017 06:28:18 +0000 (06:28 +0000)]

Merge "Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev am: 351ba95239 am: cd0aa52f35"

Erik Kline [Fri, 7 Jul 2017 06:26:54 +0000 (06:26 +0000)]

Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev am: 351ba95239
am: cd0aa52f35

Change-Id: I6820e6cc81cfa43d99ad66860e1dcf42d20109f8

commit | commitdiff | tree

Erik Kline [Fri, 7 Jul 2017 06:26:27 +0000 (06:26 +0000)]

Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev am: 351ba95239
am: cd0aa52f35

Change-Id: I10960bf23a837eda1fb473826596c484484f1875

commit | commitdiff | tree

Erik Kline [Fri, 7 Jul 2017 06:19:23 +0000 (06:19 +0000)]

Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev
am: 351ba95239

Change-Id: I0a8eb8be5562fa814109191b0110050ca4b60c02

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 06:13:55 +0000 (06:13 +0000)]

Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Fri, 7 Jul 2017 03:54:43 +0000 (03:54 +0000)]

Merge "Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev am: ec43e485e7" into oc-dr1-dev-plus-aosp
am: 01f503fe4e

Change-Id: Id4bfaac26682a028da4120e7c5de45dc8dbd9c14

commit | commitdiff | tree

Jason Monk [Fri, 7 Jul 2017 03:52:54 +0000 (03:52 +0000)]

Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev am: ec43e485e7
am: cd7cf4ae21

Change-Id: Iea50be087694d9bcc3bc307c67512dd0d206f39e

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:45:15 +0000 (03:45 +0000)]

Merge "Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev am: ec43e485e7" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Fri, 7 Jul 2017 03:43:48 +0000 (03:43 +0000)]

Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
am: ec43e485e7

Change-Id: I8ec35f9e2b02b67d700dd684ceda220591099423

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:43:06 +0000 (03:43 +0000)]

Merge "Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 2f927d56cf" into oc-dr1-dev-plus-aosp am: 4d8a211e9a"

commit | commitdiff | tree

Jason Monk [Fri, 7 Jul 2017 03:42:39 +0000 (03:42 +0000)]

Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
am: ec43e485e7

Change-Id: I97c28e7b182a4a83f6818bae66484082ed5008a0

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:41:44 +0000 (03:41 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 2f927d56cf" into oc-dr1-dev-plus-aosp
am: 4d8a211e9a

Change-Id: I94f5bc91615839448c8b0fa5d931b79dd2ac5779

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:41:36 +0000 (03:41 +0000)]

Merge "Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 2f927d56cf" into oc-dr1-dev-plus-aosp am: 4d8a211e9a"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:41:19 +0000 (03:41 +0000)]

Merge "Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp am: afae17b65c"

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:40:23 +0000 (03:40 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp
am: afae17b65c

Change-Id: Ie958cd0bfc0c282b0efd0222cdccbf03a2482622

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:40:09 +0000 (03:40 +0000)]

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:38:35 +0000 (03:38 +0000)]

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:36:58 +0000 (03:36 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp
am: 09fe1f8bbb

Change-Id: I8ca1c3e6e992a60705da57f54c84658c0c5dd430

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:35:15 +0000 (03:35 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 2f927d56cf
am: 7de9f7a334

Change-Id: I00846580b78758631cd6db262c1b5057204515f6

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]

Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:31:40 +0000 (03:31 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 2f927d56cf" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:31:05 +0000 (03:31 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:30:16 +0000 (03:30 +0000)]

Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0 am: 5482790a3f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:29:56 +0000 (03:29 +0000)]

Merge "Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp am: b8d185f2b5"

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:29:50 +0000 (03:29 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0
am: 2f927d56cf

Change-Id: Idd571a3e786afba287b83277d2e95f7143d4e37d

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:29:48 +0000 (03:29 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0
am: 5482790a3f

Change-Id: If186deb432621b5ce819ab9789b9dd57e324b440

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:29:06 +0000 (03:29 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0
am: 2f927d56cf

Change-Id: I2916aa9a24b84d4f379c8ebebc7e19eb4adc96f4

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:29:04 +0000 (03:29 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0
am: 5482790a3f

Change-Id: Ic613c35dd029bc637c6bef60d05110db31e04062

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 03:27:59 +0000 (03:27 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp
am: b8d185f2b5

Change-Id: I6021c2855cff18b56f3b8b5d653729375d056350

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:27:57 +0000 (03:27 +0000)]

Merge "Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp am: b8d185f2b5"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:27:19 +0000 (03:27 +0000)]

Merge "Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp am: f59b28acd6"

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 03:26:34 +0000 (03:26 +0000)]

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 03:26:18 +0000 (03:26 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp
am: f59b28acd6

Change-Id: Ice5849dcc7eb95ca473ca9f00764e06fde4bd65a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:26:02 +0000 (03:26 +0000)]

Merge "Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp am: f59b28acd6"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:25:46 +0000 (03:25 +0000)]

Merge "Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp am: 1bcafd657f"

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 03:24:37 +0000 (03:24 +0000)]

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 03:24:29 +0000 (03:24 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp
am: 1bcafd657f

Change-Id: I21e4cbae08d0ba7d3ea669024a83972cfabc34a5

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:22:53 +0000 (03:22 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am: 401b8907d0

Change-Id: I10b683e78ea75a1ca9cdd4e31317aa7f284ac046

commit | commitdiff | tree

Robert Carr [Fri, 7 Jul 2017 03:22:50 +0000 (03:22 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am: 401b8907d0

Change-Id: Ib7a916fb484fb3a7924315169d162f4fdddd8a06

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 03:22:24 +0000 (03:22 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp
am: 1bcafd657f

Change-Id: I0d56dca8b0f5e81b70507e50ad998543d840b48e

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 03:20:58 +0000 (03:20 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp
am: 249f2f8f2c

Change-Id: I726bf135c9d5c571218505ddce342f31bae40740

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:18:44 +0000 (03:18 +0000)]

Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e72" into oc-dr1-dev-plus-aosp
am: e48ecd63e0

Change-Id: Ib76a130e4dc2d3c157d02cdfea849f1da1bfa352

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:15:06 +0000 (03:15 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 94a82c6683"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:13:44 +0000 (03:13 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 94a82c6683"

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:12:41 +0000 (03:12 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 94a82c6683

Change-Id: I9c2ead0e5ca96c282641574da8dd65440cfb267e

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:12:02 +0000 (03:12 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 94a82c6683

Change-Id: Idcaeeee6632f3f8c32f0a4065cb7a681038445ed

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:10:21 +0000 (03:10 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 6e7e4ed024"

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 03:10:12 +0000 (03:10 +0000)]

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:09:32 +0000 (03:09 +0000)]

Merge "Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp am: 6e7e4ed024"

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:07:59 +0000 (03:07 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 6e7e4ed024

Change-Id: I7891dc3921a5e75b2e90eef959b32a88d8ef7507

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 03:07:42 +0000 (03:07 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp
am: 6e7e4ed024

Change-Id: I66ba5dd375d68f90ab21a37e37735d0e22a9a933

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 03:07:26 +0000 (03:07 +0000)]

Merge "Add missing notifyPixelsChanged"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:03:01 +0000 (03:03 +0000)]

Merge "Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp am: dbee860173"

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]

Merge "Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp am: dbee860173"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 03:01:14 +0000 (03:01 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp
am: dbee860173

Change-Id: Ida502cc100e90d5fa038f82071d8d6efd2ab1b76

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 03:00:20 +0000 (03:00 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651 am: d6c82cde94"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 03:00:00 +0000 (03:00 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp
am: dbee860173

Change-Id: Ie214fc94b33c82dc0cd67ac9f5388b74fa1393aa

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:59:01 +0000 (02:59 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651 am: d6c82cde94"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:57:19 +0000 (02:57 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651
am: d6c82cde94

Change-Id: I63d308c39363d698b15478e51c200600a04a6422

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:56:56 +0000 (02:56 +0000)]

Merge "Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c am: 1f4f1774c9"

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:56:50 +0000 (02:56 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651
am: d6c82cde94

Change-Id: Ia6c2ec49d20c53de9b8022cee342589ef2e87172

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:56:30 +0000 (02:56 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:54:53 +0000 (02:54 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c
am: 1f4f1774c9

Change-Id: Ifc37a8f62becd3bddba8b4b55e6362467c33819c

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 02:54:36 +0000 (02:54 +0000)]

Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
am: 956647ec3e

Change-Id: I7204eae9829d1e5ddc6f92ea6d358a62abc282a3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:54:15 +0000 (02:54 +0000)]

Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am: 956647ec3e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:54:07 +0000 (02:54 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev am: 3e9d74091c
am: 1f4f1774c9

Change-Id: I17f31a6e43188ae65a62fa549533002a364e774b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:53:58 +0000 (02:53 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681

Change-Id: I131d809cbe0405849193245cb82df643512a2d16

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]

Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
am: 956647ec3e

Change-Id: I6b5c09d11796f9dd07701ee647c0cb7daa0b46d3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:52:25 +0000 (02:52 +0000)]

Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am: da075a9681" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Fri, 7 Jul 2017 02:50:55 +0000 (02:50 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am: da075a9681

Change-Id: Ic4b22dab0f73fb91b23946946b6e2d30727606df

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:50:25 +0000 (02:50 +0000)]

Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e72" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:49:09 +0000 (02:49 +0000)]

Merge "Color of the ring around the lock icon" into oc-dr1-dev
am: 0903e31e72

Change-Id: I4cb8d6e0987543fa9e189c508398ba70d683064d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:48:07 +0000 (02:48 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:46:59 +0000 (02:46 +0000)]

Merge changes from topic 'am-ffdf163382234d40a4d305b203191a53'

* changes:
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8 am: 83a4419e46
AID suffix registration. am: 68f719e196 am: 243294170b

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:46:15 +0000 (02:46 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I3ec45a3d914665dcff0bea651032351c06ca514b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:44:13 +0000 (02:44 +0000)]

Merge "Merge "Hide all color hints references" into oc-dr1-dev am: b1ab0ff21e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Lucas Dupin [Fri, 7 Jul 2017 02:42:35 +0000 (02:42 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 7 Jul 2017 02:41:11 +0000 (02:41 +0000)]

Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am: 730e4a5651" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:40:05 +0000 (02:40 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: I9fff601c11c937d83f55275646ddf44a5bdf3acb

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:38:42 +0000 (02:38 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8
am: 83a4419e46

Change-Id: Ic330942b85e2c90e273db81dce9a677ac74490ae

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 02:38:38 +0000 (02:38 +0000)]

Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev

commit | commitdiff | tree

Amit Mahajan [Fri, 7 Jul 2017 02:37:34 +0000 (02:37 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am: 730e4a5651

Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:37:25 +0000 (02:37 +0000)]

AID suffix registration. am: 68f719e196
am: 243294170b

Change-Id: I858140b8b5cd368ef2db2391750e52c01bb3ae9f

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:35:31 +0000 (02:35 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev am: 5cb8f220a8
am: 83a4419e46

Change-Id: I7725724e65f6306ba5d4d4b048dd69b38c2ca5a0

commit | commitdiff | tree

Antony Sargent [Fri, 7 Jul 2017 02:35:12 +0000 (02:35 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
am: 3e9d74091c

Change-Id: I43397652ec031b5cc2730dd0f8f2b8a6481a8bbe

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:34:04 +0000 (02:34 +0000)]

AID suffix registration. am: 68f719e196
am: 243294170b

Change-Id: Ie1de1e3ba46ecc30b9028774bfc967a4b95e118b

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:25:27 +0000 (02:25 +0000)]

Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
am: 5cb8f220a8

Change-Id: I9c91dbb63239a4f7f6b2f1e70a690c0fb35c7119

commit | commitdiff | tree

Love Khanna [Fri, 7 Jul 2017 02:24:26 +0000 (02:24 +0000)]

AID suffix registration.
am: 68f719e196

Change-Id: I41f8fb65218cb6c959f36ac30b604629bd04a1f2

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:38:01 +0000 (01:38 +0000)]

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:35:19 +0000 (01:35 +0000)]

Merge "Change initial value of mStaleScanResults to false."

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 01:29:54 +0000 (01:29 +0000)]

Merge "Color of the ring around the lock icon" into oc-dr1-dev

commit | commitdiff | tree

Bryce Lee [Fri, 7 Jul 2017 00:51:26 +0000 (17:51 -0700)]

Revert "Use configuration delta to determine if still in orientation change."

This reverts commit 2a0284b1a69b57cc239357c9a5fbb514cf2fc8b2.

Reason for revert: b/63380251
Bug:62846907
Fixes:63380251

Change-Id: I18eb9e478cb2b99980a2e9bff22ba9b32b817f2f

commit | commitdiff | tree

Phil Weaver [Fri, 7 Jul 2017 00:15:15 +0000 (00:15 +0000)]

Merge "Block a11y-changing key events from a11y services"

commit | commitdiff | tree

TreeHugger Robot [Fri, 7 Jul 2017 00:12:08 +0000 (00:12 +0000)]

Merge "Hide all color hints references" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 23:50:32 +0000 (23:50 +0000)]

Merge "Make dun APNs as read-only by default." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Jul 2017 23:46:42 +0000 (23:46 +0000)]

Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev

commit | commitdiff | tree

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

Merge "Merge "Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp am: 4c92af3155" into oc-dr1-dev-plus-aosp am: 3d27bc65dc"

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:43:55 +0000 (23:43 +0000)]

Merge "Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp am: 4c92af3155" into oc-dr1-dev-plus-aosp
am: 3d27bc65dc

Change-Id: I88eca22d7d1f09c3eb2f964ece56831d00466cdd

commit | commitdiff | tree

Ruchi Kandoi [Thu, 6 Jul 2017 23:41:44 +0000 (23:41 +0000)]