tree cbc66e26a5d92a3ced244d8431a4bec153d4c15d
parent e83e719456f09e92861f11e2a6069130251cd593
parent b389ffe2d9b3ddf90093632cbbe4fc36aa384cd8
author Andrei-Valentin Onea <andreionea@google.com> 1570800141 -0700
committer android-build-merger <android-build-merger@google.com> 1570800141 -0700

Merge "Add extra compat change overriding methods."
am: b389ffe2d9

Change-Id: I77f36a1d9be2d486ca126472f26b5a35739a88cb