]> git.saurik.com Git - android/aapt.git/commitdiff
am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt...
authorJoe Onorato <joeo@android.com>
Tue, 15 Jun 2010 22:49:05 +0000 (15:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jun 2010 22:49:05 +0000 (15:49 -0700)
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'

* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.


Trivial merge