tree c5d74c8dc620eed1df62ba159d66a50a0c734299
parent 72d08d076ecd06dec28403bbfd4569796ea31f2e
parent 212d6324456722af19798b9a7bab75bd1870fa26
author Andrew Sapperstein <asapperstein@google.com> 1379437344 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379437344 -0700

am 212d6324: Merge "Fix show pics asset. b/10788522." into jb-ub-mail-ur10

* commit '212d6324456722af19798b9a7bab75bd1870fa26':
  Fix show pics asset. b/10788522.