OSDN Git Service

am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
authorJohn Reck <jreck@google.com>
Thu, 16 May 2013 20:59:20 +0000 (13:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 20:59:20 +0000 (13:59 -0700)
commit2c596d7f5988c942774fb9f8044162b4149f9ab2
tree86c3c634705a1616bb2055f68ed42ef2f241c5f4
parent78f2d565bf309c9a2fe2006d66d488e2b62603b7
parent80835b0aa14ad477adf3f23b69b2bf7c83fe0c20
am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
  Fix reset