OSDN Git Service

am e9e080f7: resolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp
authorArman Uguray <armansito@google.com>
Tue, 4 Aug 2015 22:54:53 +0000 (22:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 22:54:53 +0000 (22:54 +0000)
commit7369eba0d101f798377afe70dc26d1a7d31b1e6b
treeec3393d96b08e324868e48910ece530c0a29f649
parentf9b9bbed9fc1d9c3de130357cdb6dd08366f2797
parente9e080f7ca72123f8925dda65e545a8d3fc5e3ee
am e9e080f7: resolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp

* commit 'e9e080f7ca72123f8925dda65e545a8d3fc5e3ee':
  Compile libbtcore and libosi for host