tree f21736aaa07bd89ada87daff9755217ce84ac944
parent b5ce17e3191690b84c526fb4305e9172ea19ad02
parent 284ec6eec7ad01768295187aa2bbfc33283c4f14
author Felipe Leme <felipeal@google.com> 1497999268 +0000
committer android-build-merger <android-build-merger@google.com> 1497999268 +0000

Merge "Removed deprecated, hidden method." into oc-dev am: 17efecf48f
am: 284ec6eec7

Change-Id: I12552d81be6b8a58c9afc02c754918776d6cdda9