tree f792e7e63ff595218af3b2858fa382b1251130b9
parent aa4f40fe94266ed53f900d6199f30084b578b0b8
parent 50decd6a27e68b644786d4c4689513c68c2478f0
author Michael Kolb <kolby@google.com> 1368739975 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368739975 -0700

am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
  Add new overlay icons for sharpen and curves