tree 79fe6be8c92ccf3acef647bbaa3ee85e6f890890
parent e83bc5932eba4af67e2cd7b76648ae26740b9b01
parent a7d1a111c7176fdf853e53e74f6c7c7843c3c81c
author Adam Lesinski <adamlesinski@google.com> 1411153730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411153730 +0000

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

* commit '9ee3ba23395bd1a13bbfd3fe523ee611a5ca001b':
  Fix backwards compat problem with AAPT public attrs