tree ebb9cdd325117f4eb97669588f3ff156a7916a65
parent ed6cc299f4e21d27582b3883b1aa126215e9f1f3
parent 36beeefc84ddf6062a862bbc378d2f3719d96c0c
author Neil Fuller <nfuller@google.com> 1530794764 -0700
committer android-build-merger <android-build-merger@google.com> 1530794764 -0700

Merge "Remove unusual static method call" am: cbe9c295a3
am: 36beeefc84

Change-Id: I6ecfb33be300b88a9308102595f0e79cf2f18ae4