OSDN Git Service

Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am...
authorEvan Laird <evanlaird@google.com>
Thu, 22 Jun 2017 20:42:20 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 20:42:20 +0000 (20:42 +0000)
am: 6085cae23f

Change-Id: Iad86c9239ba5fd9b764063c15ae7a7a716746822


Trivial merge