tree 3349647eebe4beb97b9a6a7a63dd99dc86c15540
parent c2847897ffd15bc3f87bf1be5d4bafa023018096
parent 966e080ade4dec945fa657dbf378eb38d9789ee8
author Isaac Chen <ycchen@google.com> 1513052577 +0000
committer android-build-merger <android-build-merger@google.com> 1513052577 +0000

Merge "Enable VNDK for aosp_x86 and aosp_x86_64"
am: 966e080ade

Change-Id: Id8164d72b1aedd6521645df09e7ba9bb541f1c48