tree b3cb6c036d3455926dd86bece45f409783a4c903
parent 32d50e89e7877a2b38573d20a8251850c87e7851
parent d42c203a7fbbef58af268e7dcec295b7cdca6e4a
author Michael Kolb <kolby@google.com> 1369946340 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369946340 -0700

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

* commit 'af65d7ba216eba60651d11d248d20346309375ed':
  Add HTC One picture resolutions