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)
commit9c0108304c1031f3be5967654a7125106319f34a
tree229149e7bbf4bb84aff7f2aa3dca8a8f584c7716
parentd58b721e5564d15254f3135b47b6826506fb6af2
parentbd8fb0e71d02a0b3b85fa7bfed410f8d6df125bb
Merge "Resolve inflate attr against default package" into oc-dev
am: bd8fb0e71d

Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21