OSDN Git Service

am 5f263484: am 83970699: (-s ours) am 8d502374: commit 001ccea74ec61b1be00c8ede827f5...
authorDmitry Grinberg <dmitrygr@google.com>
Wed, 30 Jul 2014 16:40:38 +0000 (16:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Jul 2014 16:40:38 +0000 (16:40 +0000)
* commit '5f263484e3dc418c5498bba5abda40815db9fad3':
  commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date:   Tue Jun 17 16:29:18 2014 +0530


Trivial merge