OSDN Git Service

am 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos...
authornicolasroard <nicolasroard@google.com>
Mon, 16 Sep 2013 16:55:52 +0000 (09:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Sep 2013 16:55:52 +0000 (09:55 -0700)
* commit '685f2f7d46410376074c8318263fbd42bf09392a':
  Fix flickering while editing


Trivial merge