| commit | e44e4eae0857f6c02b76e15bce37f2374d14d58f | [log] [tgz] |
|---|---|---|
| author | Fabrice Di Meglio <fdimeglio@google.com> | Mon Feb 04 13:17:37 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 04 13:17:37 2013 -0800 |
| tree | a73b7f8d4ce5ac85bc27990a1655dff19b49d9ad | |
| parent | feda56f2fbbb980f074bce4444578238544aefe1 [diff] | |
| parent | 48b4c17ce1537234a2a6a39c9c00d3663b2a7274 [diff] |
am 48b4c17c: (-s ours) 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 (4) and others * commit '48b4c17ce1537234a2a6a39c9c00d3663b2a7274': Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE