tree d7ac39d021c934c5894a326b7a19680537246fda
parent a746ed8549873c98fca7ab9423c23d6b327b7234
parent b6812b64c42ee15a1afa295fe341103fe02006ae
author Adam Lesinski <adamlesinski@google.com> 1411151388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411151388 +0000

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

* commit '19f9d54fec2659769748d72972b4bed6a033571a':
  Fix backwards compat problem with AAPT public attrs