am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev

* commit '0bfee5a4905a14a318731661214558792abc2f7d':
  fix javadocs b/14414251

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