tree 3b070d651aa3da546ba4768eea15afee4e10149e
parent 297bdb1908b5c42f0c07e3fb29ba1e43f8b8d607
parent 371b9b0d6e77aff08c32897e6009ecb8f9fd02de
author Chen Xu <fionaxu@google.com> 1487798572 +0000
committer android-build-merger <android-build-merger@google.com> 1487798572 +0000

Merge "cleanup deprecated lingering code for otasp"
am: 371b9b0d6e

Change-Id: I2fee96573335b3b7f215e670ffcd5b21088d8d88