tree b2bcd7071d236d86b88325d244a5527e6044f86d
parent 1a89ff6ef5cbf06906983d76c4983e8b030aa59c
parent c5deca7c6a4139875e9b86c951f2b81b2db9f816
author Michael Jurka <mikejurka@google.com> 1319741116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319741116 +0000

am c5deca7c: Merge "Asset updates" into ics-mr1

* commit 'c5deca7c6a4139875e9b86c951f2b81b2db9f816':
  Asset updates