tree 2cc9e4e90c01ca2ed18810056bd16e253bf6b1a3
parent 66c236598a273c308384423a1d9babce05c79588
parent af65d7ba216eba60651d11d248d20346309375ed
author Michael Kolb <kolby@google.com> 1369946307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369946307 -0700

am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce

* commit 'af65d7ba216eba60651d11d248d20346309375ed':
  Add HTC One picture resolutions