tree 0f35440ea4d85966999002c8146f9e7d5f41d5fa
parent af98c95d8e526b4b1d464aecd1c8a273707d1fec
parent d6c1993f6c24ff64c18a40ab596d5131b02d6f51
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