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

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

Change-Id: I65e100f3be42fabe27cdf2f1950cd459991780e4