tree a9b6329fbad89c3a339057c8d6c9ba1b92631674
parent 4c89ec75151c28a905602b79f125583eba6edcd5
parent 0bdafb193e49e2b89eeb9f4c197bbc60635c6419
author John Hoford <hoford@google.com> 1376410353 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376410353 -0700

am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419':
  add circle brush