am 36818c41: Merge "Unbreak documentation build." into jb-mr2-dev
am 36818c41: Merge "Unbreak documentation build." into jb-mr2-dev

* commit '36818c414d5ccd23ea7bb68993b007aee50a8cc6':
  Unbreak documentation build.

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