commit 23aa4774b74bdd7b59a36fdf37333d33e03d7a1f
author Dirk Dougherty <ddougherty@google.com> Mon Feb 04 09:06:45 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 04 09:06:45 2013 -0800
tree f84af624262a2336e29a598fafda8ab21c3e1d41
parent 7ffbbc276cfc9748a116dca3e8dac99c6b4490b4
parent 904ffedb7e904246aadcc5519da2adbf112a0430

am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev

# Via Android Git Automerger (3) and others
* commit '904ffedb7e904246aadcc5519da2adbf112a0430':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.