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

* commit 'd3a79db8fe09ac4d5bb404f4bb48a5f66d005db2':
  add otatools-package target
This commit is contained in:
Tao Bao
2015-08-25 23:49:14 +00:00
committed by Android Git Automerger

Diff Content Not Available