tree a582d876d2358c92ad77ed01bcf1d6d40dd3ad4d
parent cb7c5498709526e2a2367a7f36f83caf05be5f1a
parent 88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f
author Patrick Dubroy <dubroy@google.com> 1285372819 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285372819 -0700

am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread

Merge commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp

* commit '88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
  do not merge - Asset update (pass #3)