am 4dcdfb89: am f5951baf: (-s ours) am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev

# Via Android Git Automerger (3) and others
* commit '4dcdfb89015942f57b98861a7fbcef948364b992':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE