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)
* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target


Trivial merge