]> git.saurik.com Git - android/aapt.git/commitdiff
am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java...
authorXavier Ducrohet <xav@android.com>
Tue, 19 Jul 2011 17:23:16 +0000 (10:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Jul 2011 17:23:16 +0000 (10:23 -0700)
* commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e':
  Copy once-created R.java into library projects


Trivial merge