OSDN Git Service

Merge "Resolve inflate attr against default package" into oc-dev
authorAlan Viverette <alanv@google.com>
Fri, 26 May 2017 21:03:07 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 21:03:07 +0000 (21:03 +0000)
am: bd8fb0e71d

Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21


Trivial merge