OSDN Git Service

am f5951baf: (-s ours) am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for...
authorFabrice Di Meglio <fdimeglio@google.com>
Fri, 1 Feb 2013 22:26:05 +0000 (14:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Feb 2013 22:26:05 +0000 (14:26 -0800)
commit4dcdfb89015942f57b98861a7fbcef948364b992
tree3115ff23547da61d4866d3953e044c49563e477d
parent5fca0efa17c85945fc42cb1a890889f3fab8ec00
parentf5951baf7dcc426485badf19985148b6a2fcf82e
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 (2) and others
* commit 'f5951baf7dcc426485badf19985148b6a2fcf82e':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE