OSDN Git Service

Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d
authorJorim Jaggi <jjaggi@google.com>
Fri, 14 Apr 2017 17:54:07 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 17:54:07 +0000 (17:54 +0000)
commit7f86cd606dce333e55cacecc244f6442b849a1e7
tree9691e6306eaac60a76547788634e47cf0afc43e3
parentebb2bbba5729ec87ea6e06c3a399a756b6bfd2b5
parent5cf511907d73b16b5e153b0c9a787312b48ffc55
Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d
am: 5cf511907d

Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd