tree ab3880e3282eec2c54b947cac7ee2011e7ee8f3d
parent 4dc8d46cd03d3421265dd9edefe7748b446dac0d
parent de4495d2a043b133b075c38d23180a5974c9723d
author Adam Lesinski <adamlesinski@google.com> 1411410200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411410200 +0000

am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev

* commit '36b5795fc9e9a2eed320a0d626bce44a8c231f6b':
  AAPT: Continuation of public/private attribute fix