tree af22ff3e1c37bce425c329ab7e9b8a9e16b078f2
parent 89502b999c95c61ac7bfee8dc65eb84f04545995
parent 67ab8fa5bc54706e26526582d807b3c9e5f08079
author Adam Lesinski <adamlesinski@google.com> 1411153157 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411153157 +0000

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

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