OSDN Git Service

am 6196fadc: (-s ours) am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:23 +0000 (18:14 +0000)
commit28c4c0c629b1c0c3f07e48c149bc35720ef2754b
tree3804e07840427a842ef1bdc750bffe2239123c26
parent8edbafc3daf0c467e3b3db900356e7759e67c42a
parent6196fadc87d07d1269ed121b2423662c6b3eebbf
am 6196fadc: (-s ours) am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad

* commit '6196fadc87d07d1269ed121b2423662c6b3eebbf':