]> git.saurik.com Git - android/aapt.git/commitdiff
Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Thu, 17 Jan 2013 17:02:37 +0000 (17:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Jan 2013 17:02:50 +0000 (17:02 +0000)

Trivial merge