OSDN Git Service

am a16cc411: (-s ours) am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:42 +0000 (18:14 +0000)
* commit 'a16cc41137119819847b7095c0446d96201e2d8c':


Trivial merge