tree 23b233df920333304325604389e12518a3b697f3
parent f56c94a3c7c87f3619ab2787783a38ee60cc3cbb
parent 780ccdabbd604773dea93b104d87f408e7fdc12a
author David Benjamin <davidben@google.com> 1481836104 +0000
committer android-build-merger <android-build-merger@google.com> 1481836104 +0000

Merge "Tidy up *_METHOD setup."
am: 780ccdabbd

Change-Id: I597777baa6dd04d6112905a0019f27d5d6c132d1