OSDN Git Service

am 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll
authorBobby Georgescu <georgescu@google.com>
Tue, 2 Oct 2012 22:54:11 +0000 (15:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Oct 2012 22:54:11 +0000 (15:54 -0700)
* commit '4b759a1341313fa4aeaaf8293202eb2aaabadec5':
  Show Camera placeholder as first filmstrip item in roll


Trivial merge