commit | ee6ecb1d59a6a4e7c1363cb867cafd4f1b9342f5 | [log] [tgz] |
---|---|---|
author | John Hoford <hoford@google.com> | Thu Dec 05 21:30:43 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 21:30:43 2013 +0000 |
tree | 8a902919d001d7eb75f0ddb70cac30bac361fd32 | |
parent | e09fbdf13f1170bc51ee51538c339973762f61ec [diff] | |
parent | 9b57886d0f6eba16a258cea1568a4c6d2ec4473c [diff] |
am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad * commit '9b57886d0f6eba16a258cea1568a4c6d2ec4473c':