am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev
am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev

* commit 'c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73':
  Camera2: fix Face class java doc build break

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