am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread
am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread

Merge commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a'

* commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a':
  Fix SDK docs 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