OSDN Git Service

am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
authorTao Bao <tbao@google.com>
Tue, 25 Aug 2015 23:35:45 +0000 (23:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 23:35:45 +0000 (23:35 +0000)
commit967b52fb0b4589275d347f8e76bd3fcc9bb209a4
tree44a790f353b8e31b2a6b4283346a2c3acc928679
parent64e4d8a211546cde5ff5d4dea8ef69c86ed38067
parentafc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825
am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target