tree 11cdfd10ab302973dd88a6928a8637d461a080fd
parent 391232da084d715b9f20539a98b4a49cc56bf949
parent 9b624c186cb6059dfb3ec24bfb6386a0fc17b88c
author Adam Lesinski <adamlesinski@google.com> 1417717479 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417717481 +0000

Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev