OSDN Git Service

Merge "Make sure theme attributes don't get lost" into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Fri, 14 Apr 2017 05:34:38 +0000 (05:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 05:34:38 +0000 (05:34 +0000)
am: 9d2f03ec5d

Change-Id: I4a2d163e18ce899eb97bfcff7c92de3a7ffb186c


Trivial merge