OSDN Git Service

am 6e7d944d: (-s ours) am b80c1e77: am 15ccccf6: Merge "Fix the checks for when to...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:36 +0000 (18:14 +0000)
commit699cb68d5f55181e6d8d51b28e85e885087a1e64
tree3804e07840427a842ef1bdc750bffe2239123c26
parentd2ff970b947d88071d382443b59764c210ee5deb
parent6e7d944d87c995091e193108a3fab0950a6825fc
am 6e7d944d: (-s ours) am b80c1e77: am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad

* commit '6e7d944d87c995091e193108a3fab0950a6825fc':