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

* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target
This commit is contained in:
Tao Bao 2015-08-25 23:35:45 +00:00 committed by Android Git Automerger
commit 967b52fb0b

Diff content is not available