tree cd872cef5ec386118d0f8684436acf25815487cc
parent 3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb
parent afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825
author Tao Bao <tbao@google.com> 1440545991 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440545991 +0000

am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target