OSDN Git Service
Jason Monk [Fri, 7 Jul 2017 17:10:01 +0000 (17:10 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev
am:
e7e2f36a47
Change-Id: Ib7ecd54f85c22d7f2cf88d254ea5b746641c6e64
TreeHugger Robot [Fri, 7 Jul 2017 17:00:12 +0000 (17:00 +0000)]
Merge "Fix clipping of large global actions items" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 16:51:30 +0000 (16:51 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
am:
1a16b17ed1
Change-Id: Ibcaff980c79f0bdc2a0567d6fcea2b8e29ab50b8
TreeHugger Robot [Fri, 7 Jul 2017 16:42:03 +0000 (16:42 +0000)]
Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 16:18:34 +0000 (16:18 +0000)]
Merge "Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev am:
3bd612f92b" into oc-dr1-dev-plus-aosp
Adrian Roos [Fri, 7 Jul 2017 16:17:35 +0000 (16:17 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
am:
3bd612f92b
Change-Id: I2ab9a1842c6e9a5acdde4d5c3470bf645aa55e18
Adrian Roos [Fri, 7 Jul 2017 16:16:31 +0000 (16:16 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
am:
3bd612f92b
Change-Id: I42ac8090c978c7b42ab11c19a89e4c15327c0a8f
TreeHugger Robot [Fri, 7 Jul 2017 16:10:13 +0000 (16:10 +0000)]
Merge "AOD: Keep doze brightness when unlocking with fingerprint" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 16:00:55 +0000 (16:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2fb78bafc7 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:59:35 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2fb78bafc7 -s ours
Change-Id: Ie2fb8eaa3d8200f63340cb2103d12ef921eb7903
Bill Yi [Fri, 7 Jul 2017 15:59:30 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2fb78bafc7 -s ours
Change-Id: If579306318f2f38af5c11359e59b357ea0942b56
Android Build Merger (Role) [Fri, 7 Jul 2017 15:56:53 +0000 (15:56 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
9da0a744c5 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:55:58 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9da0a744c5 -s ours
Change-Id: Ic856cb8ca560d42fae8f1b6499716300f39218c8
Android Build Merger (Role) [Fri, 7 Jul 2017 15:55:40 +0000 (15:55 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
33393ffa7d -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Fri, 7 Jul 2017 15:54:31 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
33393ffa7d -s ours
Change-Id: If4cd6d9504c519c186e1f3a1913ed91e81a3ae6b
Bill Yi [Fri, 7 Jul 2017 15:54:03 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9da0a744c5 -s ours
Change-Id: Ib4c07c473d892138f9df7bdf898f234f9bc990f0
Bill Yi [Fri, 7 Jul 2017 15:52:50 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
33393ffa7d -s ours
Change-Id: I43463ebcdccbd71229ee344a6af7b943a94d2dda
TreeHugger Robot [Fri, 7 Jul 2017 15:52:21 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 15:40:25 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 15:39:04 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jason Monk [Fri, 7 Jul 2017 14:36:03 +0000 (10:36 -0400)]
Fix clipping of large global actions items
Test: visual
Change-Id: I9f652642055d190e2368dab89fe56518fb15eb19
Fixes:
63150552
Adrian Roos [Fri, 7 Jul 2017 13:58:57 +0000 (15:58 +0200)]
AOD: Keep doze brightness when unlocking with fingerprint
Updates the logic that was already in place to prevent lighting up
the display before the unlock transition starts:
- treat AOD as pulsing in FingerprintUnlockController
- now that doze can use more than one brightness level, use the current
Bug:
62885451
Test: Unlock with fingerprint from AOD. Observe that the unlock transition does not prematurely change the brightness level
Change-Id: I266bd5e4c0a1d5b4c347a65c0e7936247e333cfc
Android Build Merger (Role) [Fri, 7 Jul 2017 12:45:08 +0000 (12:45 +0000)]
Merge "Merge "Fix translation direction in QS animation" into oc-dr1-dev am:
feb5dc3b26" into oc-dr1-dev-plus-aosp
Jason Monk [Fri, 7 Jul 2017 12:43:55 +0000 (12:43 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
am:
feb5dc3b26
Change-Id: I1c96516294b275eedcd543958ecbd45bad014a59
Jason Monk [Fri, 7 Jul 2017 12:42:45 +0000 (12:42 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
am:
feb5dc3b26
Change-Id: Ib59b2670a1d031b52b9ca9427fb1dbfe2286f3c9
Jason Monk [Fri, 7 Jul 2017 12:36:11 +0000 (12:36 +0000)]
Merge "Fix translation direction in QS animation" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 11:28:58 +0000 (11:28 +0000)]
Merge "Merge "Keeping notifications around that show guts" into oc-dr1-dev am:
ea2cbdecca" into oc-dr1-dev-plus-aosp
Adrian Roos [Fri, 7 Jul 2017 11:27:39 +0000 (11:27 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
am:
ea2cbdecca
Change-Id: Ib74148ab149d4158b985c7813542b63e8e6c61f4
Adrian Roos [Fri, 7 Jul 2017 11:27:15 +0000 (11:27 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
am:
ea2cbdecca
Change-Id: Ie9e2152a7aadf1f9b3cd42aa6a3791cb62ab34bc
Adrian Roos [Fri, 7 Jul 2017 11:22:51 +0000 (11:22 +0000)]
Merge "Keeping notifications around that show guts" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 10:08:36 +0000 (10:08 +0000)]
Merge "AOD: Add logging" into oc-dr1-dev
am:
22b76d5deb
Change-Id: I478d38cf4681fd45b094fdad6f1e9df5ecd17b37
Adrian Roos [Fri, 7 Jul 2017 10:03:05 +0000 (10:03 +0000)]
Merge "AOD: Add logging" into oc-dr1-dev
Bill Yi [Fri, 7 Jul 2017 09:16:14 +0000 (02:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f7d8a0b363893098604e0b912974ca56b67100c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Fri, 7 Jul 2017 07:58:30 +0000 (07:58 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
d7e6de2267" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:57:33 +0000 (07:57 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
d7e6de2267
Change-Id: I071316f1e00d71edb16d17bb8c2971ec7f665768
Android Build Merger (Role) [Fri, 7 Jul 2017 07:57:30 +0000 (07:57 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
d7e6de2267" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:56:41 +0000 (07:56 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:56:25 +0000 (07:56 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
d7e6de2267
Change-Id: Ica715d36549f120a63ad70ce348ba6032ffc3eaa
Android Build Merger (Role) [Fri, 7 Jul 2017 07:55:30 +0000 (07:55 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:55:27 +0000 (07:55 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: If58174412aeaaad00a49143c67c19e1fef191709
Android Build Merger (Role) [Fri, 7 Jul 2017 07:54:43 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:54:30 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: I9ad7c61b3a068246d486f81ec4d0929ebd787ace
Adam Vartanian [Fri, 7 Jul 2017 07:53:40 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: Ie057e5a870c9e58b4999cecb56c19aaca6183121
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:33 +0000 (07:53 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:04 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793 am:
5cba3b343f" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:52:21 +0000 (07:52 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: I43b7bb188a723e131056adc5e85571003c0bad21
Adam Vartanian [Fri, 7 Jul 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793
am:
5cba3b343f
Change-Id: I79f96c13475ef98c6457f5125bd1dd752f0a32db
Adam Vartanian [Fri, 7 Jul 2017 07:50:56 +0000 (07:50 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793
am:
5cba3b343f
Change-Id: I922f53fa48cb0acaa8c663202d7b1e5ffc2683f9
Android Build Merger (Role) [Fri, 7 Jul 2017 07:47:44 +0000 (07:47 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:46:46 +0000 (07:46 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:46:33 +0000 (07:46 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: I2d9a30cb879a2b689f5519b8d4c066de1265f0df
Android Build Merger (Role) [Fri, 7 Jul 2017 07:45:52 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:45:45 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: Ib2abfdf4a3d445a3e404877d6187480f86e4956f
Adam Vartanian [Fri, 7 Jul 2017 07:44:34 +0000 (07:44 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I0757cbf92a049cc20226172b6d3261f5ef23b362
Adam Vartanian [Fri, 7 Jul 2017 07:43:53 +0000 (07:43 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I6b5e764a2b8653937c0edaaa6b9450973a38dac4
Android Build Merger (Role) [Fri, 7 Jul 2017 07:38:38 +0000 (07:38 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
Adam Vartanian [Fri, 7 Jul 2017 07:37:18 +0000 (07:37 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: Ib9c11cb5d7cf80f6dc8695d3b3c28f82854f3617
Adam Vartanian [Fri, 7 Jul 2017 07:36:34 +0000 (07:36 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: I99631c3166ced487e990f28f0e7c10c180d6473a
Adam Vartanian [Fri, 7 Jul 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Streamline testInstall_compatibleContext()"
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
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
Bill Yi [Fri, 7 Jul 2017 05:45:34 +0000 (22:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I00e4f252a805a1085523991237cfd84b4b397865
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
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
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
TreeHugger Robot [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]
Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
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
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
Bill Yi [Fri, 7 Jul 2017 03:30:32 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5949b2f491bc3cf64d2b205ed5af758316ee9ac4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Love Khanna [Fri, 7 Jul 2017 02:24:26 +0000 (02:24 +0000)]
AID suffix registration.
am:
68f719e196
Change-Id: I41f8fb65218cb6c959f36ac30b604629bd04a1f2
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
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