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:39:51 +0000 (23:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 23:39:51 +0000 (23:39 +0000)
commitd3a79db8fe09ac4d5bb404f4bb48a5f66d005db2
treecd872cef5ec386118d0f8684436acf25815487cc
parent3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb
parentafc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825
am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target