Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" am: 7160459
am: ae975ab

* commit 'ae975aba7372b18cbf7f30cdc4b74cff32cc3558':
  Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()

Change-Id: I565ec862ff883bac9894aeec6fc63b7ce323e00c