tree e71a1b8d7ea8985ec78530fcdd4e2660b5db332c
parent fcaf9c30a659a5a80cb9d09ab0a453b5ef1ad21a
parent 702d7f32d20cfa4944e9538276aca786ef0a5e94
author Jeff Sharkey <jsharkey@android.com> 1497305359 +0000
committer android-build-merger <android-build-merger@google.com> 1497305359 +0000

Follow revert back to oc-dev APIs. am: a731198905
am: 702d7f32d2

Change-Id: I5f5ffacd8c90bde8af6b8202f8677f792650f963