OSDN Git Service

am 5da1c942: am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeho...
authorBobby Georgescu <georgescu@google.com>
Mon, 5 Nov 2012 23:52:51 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:52:51 +0000 (15:52 -0800)
* commit '5da1c942ad9040d00973be2c650759fbfba7e73b':


Trivial merge