am 24369237: Merge "Fix docs"
am 24369237: Merge "Fix docs"

* commit '24369237f2a5c067738dcf03747bd37686dace29':
  Fix docs

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