OSDN Git Service

am 83970699: (-s ours) am 8d502374: commit 001ccea74ec61b1be00c8ede827f55c0359d1051...
authorDmitry Grinberg <dmitrygr@google.com>
Wed, 30 Jul 2014 00:49:44 +0000 (00:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Jul 2014 00:49:44 +0000 (00:49 +0000)
commit5f263484e3dc418c5498bba5abda40815db9fad3
tree093725cc630986b7b01b6315882181813e512979
parent5fb6df1f90de6e69f712a07c819468b74a6233ef
parent839706997f7c16a67d4dcc70889f2e1a934a5da2
am 83970699: (-s ours) am 8d502374: commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date:   Tue Jun 17 16:29:18 2014 +0530

* commit '839706997f7c16a67d4dcc70889f2e1a934a5da2':
  commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date:   Tue Jun 17 16:29:18 2014 +0530