OSDN Git Service

Merge \\"Add NightDisplaySettingsActivity\\" into nyc-mr1-dev am: 53e9f35239
authorJustin Klaassen <justinklaassen@google.com>
Fri, 22 Jul 2016 22:15:48 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 22:15:48 +0000 (22:15 +0000)
am: f4f56407c3

Change-Id: I56c76b69d457714fac17b7f8d28f5d1437cce698


Trivial merge