commit db911cf4098213777e738b05995f26833a9f493c
author Dirk Dougherty <ddougherty@google.com> Mon Feb 04 13:17:03 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 04 13:17:03 2013 -0800
tree 140c715369d030bc726c4173245dfcc203b91f1b
parent c013451d63dcd0c331ec58abc8b1f030556e22bb
parent 23aa4774b74bdd7b59a36fdf37333d33e03d7a1f

am 23aa4774: 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 (4) and others
* commit '23aa4774b74bdd7b59a36fdf37333d33e03d7a1f':
  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.