OSDN Git Service

am 80460004: am 4fb063a3: am 4badab05: (-s ours) am c4766e31: Revert "commit 001ccea7...
authorDmitry Grinberg <dmitrygr@google.com>
Fri, 8 Aug 2014 02:27:59 +0000 (02:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Aug 2014 02:27:59 +0000 (02:27 +0000)
* commit '804600043851e8025edea3e2dddda6d437e4e97e':
  Revert "commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date:   Tue Jun 17 16:29:18 2014 +0530"


Trivial merge