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)
commit9933d1497b4da00904e600c4b0e0017d29e0e5ef
tree25fce0dec27a2173d0662b20a278d10d333e30b7
parent1d21c27787a3700af1a24d8eff6b7963e6ddb099
parent685f2f7d46410376074c8318263fbd42bf09392a
am 685f2f7d: am 9d36d82f: Merge "Fix flickering while editing" into gb-ub-photos-carlsbad

* commit '685f2f7d46410376074c8318263fbd42bf09392a':
  Fix flickering while editing