tree 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
parent 260c04a4c5ab82e092e09559647c03a6fa6c53d2
parent b56665681c4d4d141e381fd6c1e6f5d7c90d45c0
author Daniel Sandler <dsandler@android.com> 1283366899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283366899 -0700

am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread

Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp

* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
  Fix build (restore deleted assets).