OSDN Git Service

am 5dce70b7: am f0f2461c: am 6e27443e: am e9541583: am f379211c: am 47c4474e: Merge...
authorAlan Newberger <alann@google.com>
Fri, 26 Sep 2014 15:24:48 +0000 (15:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 15:24:48 +0000 (15:24 +0000)
* commit '5dce70b766c83cd9a80be557523a304e73d8c261':
  Force filmstrip images to generate in JPEG compression format


Trivial merge