OSDN Git Service

am dd74601e: (-s ours) am 12055197: (-s ours) am ef0fa0e7: (-s ours) am fbbc8f1e...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 07:35:16 +0000 (07:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 07:35:16 +0000 (07:35 +0000)
* commit 'dd74601ea7c76ca0a3bfe4edae57c443fcb773c6':


Trivial merge