tree 8b085339eafa29cdb40a777319cd942bae6f1b16
parent d5431ed5505a42e5e33c8bf7cc2ff72792979be9
parent 82943ecfe2c4266cf3db50326240825fefcaa38f
author Xavier Ducrohet <xav@android.com> 1311095711 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311095711 -0700

am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
  Add dependency generation to Aapt for R.java