tree fcd53787b65f0ff0e1449b3ba1794d5edc79be32
parent 26d5da351e5fbeb23605a643923e896bb3a0d57c
parent ecdaa576af69361538738b9982b22d25017012a3
author Adam Lesinski <adamlesinski@google.com> 1411151835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411151835 +0000

am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

* commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7':
  Fix backwards compat problem with AAPT public attrs