| commit | 03a49d85713be63a791ba7e4591aa72f3e2a13b1 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu May 16 13:54:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 13:54:41 2013 -0700 |
| tree | e186bb16144f79da9cb0c57689ee059b119cc087 | |
| parent | b6ad64dce341b96a68eecca6cc6ceda633c1a521 [diff] | |
| parent | 436a2bcaf47c32a2a1b1cee2871d936c062ce699 [diff] |
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce * commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195': Fix reset