tree a5b01e7714e08c28da6d945bea0296d013cbaccf
parent 25bb38f64c35f884ab9e96105a5cc5cbba8043ac
parent 2de45ab7c0c3f1539ea68272f7f4fe3fb7da39aa
author Daniel Sandler <dsandler@android.com> 1283372467 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283372467 -0700

am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread

Merge commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10'

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