tree 1241f67c12c5cdd672102695ffc260308fc649f7
parent 6cb87b088381f4c0cba334a1285d8d170458b793
parent 9fd4893c56747a154094ecf1a1733a5faf7f8976
author Fabrice Di Meglio <fdimeglio@google.com> 1359757344 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359757344 -0800

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

# Via Android (Google) Code Review (1) and others
* commit '9fd4893c56747a154094ecf1a1733a5faf7f8976':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE