OSDN Git Service

am 9082fab9: (-s ours) am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f...
authorBaligh Uddin <baligh@google.com>
Fri, 25 Jul 2014 17:08:13 +0000 (17:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jul 2014 17:08:13 +0000 (17:08 +0000)
* commit '9082fab9e46ca3a5e82917fb47940ca49730cdd3':


Trivial merge