commit | 48b4c17ce1537234a2a6a39c9c00d3663b2a7274 | [log] [tgz] |
---|---|---|
author | Fabrice Di Meglio <fdimeglio@google.com> | Mon Feb 04 09:07:09 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 04 09:07:09 2013 -0800 |
tree | 5d0143b0482a677178fac694a571ce0a6765fe9f | |
parent | 25f97435302d8468afeb4ade9f00d5243b393082 [diff] | |
parent | 4dcdfb89015942f57b98861a7fbcef948364b992 [diff] |
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