OSDN Git Service

am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
authorNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 23:35:41 +0000 (23:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 23:35:41 +0000 (23:35 +0000)
commitb0127aadafbf3b314475e48772fdcc17939c5a9c
tree9995a90a882eb46b387ee1b6c46eb82c6209f1f2
parent83e60e42573ebc1bb06a408170bcdac2824e8dd6
parent69412a51f58fa9450f1cb077c8d4b6410128d993
am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit '69412a51f58fa9450f1cb077c8d4b6410128d993':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev