tree 62a3555429c3caf6d6220df764adf91a9ee9b991
parent e5b9400b84eadfb1a13383d710e360807eb8e1a0
parent 0092886a15a8a1b6db565b4a0813d028ba5d9482
author Xavier Ducrohet <xav@android.com> 1311095905 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311095905 -0700

am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"

* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects