OSDN Git Service

am 049d6337: (-s ours) am fa44b8ec: am ae9a7783: am 28019abc: Change keyguard camera...
authorAlan Newberger <alann@google.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
* commit '049d6337952bce6100e174ffdbbfbf9bf9b284e8':


Trivial merge