tree c34753e5a5501e2d3224c02caf811890a7a791d3
parent 8ab72f5f5c23df14fbd5b87ea96db37ff11866b3
parent 6610eead313278bd03f5b30e35992ad1eea40b22
author Michael Kolb <kolby@google.com> 1369946253 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369946253 +0000

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