OSDN Git Service

Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
authorMarkus Michler <mmichleraosp@gmail.com>
Tue, 29 Mar 2016 18:30:31 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Mar 2016 18:30:31 +0000 (18:30 +0000)
commitae975aba7372b18cbf7f30cdc4b74cff32cc3558
treec4a7ae2ee479c01cfb5262ebd1ac3acef67029af
parent8e9cc787691ffd7ec745aa55b0e484970fad30e4
parent71604596117c02a885da356cd0015c29493e48bc
Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()"
am: 7160459

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

Change-Id: I5d522742dc4c7a46a74dfe4838c5bde8aadd8789