tree 576225fa174a111a31cf869f417798013c3ccf11
parent ea909008b93f8ab3c457aa4e69bb1e04c22e5706
parent d7f170db869f2285fa257204de61ad471ad7babc
author Erik Gilling <konkers@android.com> 1300314498 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1300314498 -0700

Merge changes I051d9130,Ibf3c7635 into gingerbread

* changes:
  add missing fields to AndroidManifest.xml
  update assets