tree 3cc731c2fd0fc08a18c79ef99ea7b52f07eb5f05
parent 1614843e93d98910147380969d034009ecb23aa2
parent a3c3edc68f90ee9e53abcc527cc900a01202a522
author Daniel Sandler <dsandler@android.com> 1283366776 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283366776 -0700

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