am 053644db: Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev
am 053644db: Merge "add api level 17 to javadoc filter and update version number" into jb-mr1-dev

* commit '053644dba95d07335853101e280cfc77c5fe6068':
  add api level 17 to javadoc filter and update version number

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