tree 6e236d9567296fa3f2eb429edb761e766f1cad6e
parent a0c2c8968196314dda606ffae581d10c982089d9
parent 39da850a95691d254bd03e0331aafb2d2053a628
author Peter Qiu <zqiu@google.com> 1493689964 +0000
committer android-build-merger <android-build-merger@google.com> 1493689964 +0000

Merge "hotspot2: hide Release 2 APIs" into oc-dev
am: 39da850a95

Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9