tree b9c6132dd6a2356e83b61782ccced022487ab54c
parent 91fffb39cf1eb7919cab48c56eb1b44727f4e5c2
parent 4a4d4ef24b7edbbdf1614373880681e5406df246
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