am e6734b6b: Merge "Fix javadoc for Adapter.getViewTypeCount()"

* commit 'e6734b6b1247577ebdeacff441f6ab8cfe25a1e3':
  Fix javadoc for Adapter.getViewTypeCount()