tree e0ad7d2866a4ff2d806f4a4765e56c74c12b9b8f
parent e24e12df358914a90ae02400294ae0b7ffff8fbd
parent d6c190c8d2df5cf1589cb373eb833476eb5275b8
author Winson Chung <winsonc@google.com> 1493767668 +0000
committer android-build-merger <android-build-merger@google.com> 1493767668 +0000

Merge "Restoring old methods for compatibility." into oc-dev
am: d6c190c8d2

Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8