OSDN Git Service

am 2f160d38: (-s ours) am 16fa58cb: Merge "Fix to check the incoming userid argument...
authorJean-Michel Trivi <jmtrivi@google.com>
Thu, 27 Aug 2015 10:24:08 +0000 (10:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:24:08 +0000 (10:24 +0000)
* commit '2f160d38c02275150864afaf2649949a00234209':


Trivial merge