am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken

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