tree a50c493a6e8aed0382096ee275c161e766d4aa91
parent 0fbd4cbe2312b5e9c4cbe05d2504a27d5d9d673c
parent 8538b04bfe088cad2ca4d9ecab77b94df46f1322
author Chen Xu <fionaxu@google.com> 1485904226 +0000
committer android-build-merger <android-build-merger@google.com> 1485904226 +0000

Merge "otasp refactor"
am: 8538b04bfe

Change-Id: I83df33f71ee04fa6504fb261730e00aff00b0421