am 3f6f2fc0: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp
am 3f6f2fc0: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp

* commit '3f6f2fc062998115098b78a0f3c4bb71d0440f4c':
  Don't pollute the namespace for two uses.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base