OSDN Git Service

am 06fe817a: am 95ce04cb: am 34c84972: am 7835ea8c: Merge "Fix crash" into gb-ub...
authornicolasroard <nicolasroard@google.com>
Fri, 11 Oct 2013 20:12:51 +0000 (13:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Oct 2013 20:12:51 +0000 (13:12 -0700)
commit401f96afc3288656c44d5887a3c05dd6987fd54b
treee1277d1545496fa1e4810aedf58fc0888ce50e34
parent4eb145a1b66492854cc93b5dfbe32cb3ab15ede5
parent06fe817a017d18e5db8276dd7d59d83bb69e071e
am 06fe817a: am 95ce04cb: am 34c84972: am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '06fe817a017d18e5db8276dd7d59d83bb69e071e':
  Fix crash