tree 0625e2156719f3a0e148b340f76b592c7c380de4
parent 1c1fbf2c4432c8572f0b08513e6413df5a745537
parent ad6a7ba628bbf211ca705898f9259076708e414f
author Alan Viverette <alanv@google.com> 1464187223 +0000
committer android-build-merger <android-build-merger@google.com> 1464187223 +0000

Merge "Merge "Default system theme should be DeviceDefault" into nyc-dev am: 10ed7de7ae am: 1abdeafbd9" into nyc-mr1-dev-plus-aosp
am: ad6a7ba628

* commit 'ad6a7ba628bbf211ca705898f9259076708e414f':

Change-Id: I3f8e68f6d74782c7c63e7c553eb76d781b0ec612