am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of...
am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev
* commit '58c483fc':
Avoid OOBE when AbsListView layout is out of sync with adapter