tree 0dfc549e6844912f0eed2da8446cd7b073206305
parent 8a05a952cbeb94eaf5ba6fd9e710b5afd7ca1fee
parent d1c32480c66147dbffd6cb7c9cf8a8a8a0e38fc9
author Ying Wang <wangying@google.com> 1315420039 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1315420039 -0700

am d1c32480: am fa28e3e4: Merge "Use a separate apk module definition to add core-tests resource." into gingerbread

* commit 'd1c32480c66147dbffd6cb7c9cf8a8a8a0e38fc9':
  Use a separate apk module definition to add core-tests resource.