tree 906fdc9b8eb36f4fde16bf36d1fedd54c6033689
parent 1826e8c36de8937652416c7702addc6fc7efc489
parent d6e176c807d503beb1241ba73355a73ceca47e3e
author Dirk Dougherty <ddougherty@google.com> 1359757317 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359757317 -0800

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 (Google) Code Review (1) and others
* commit 'd6e176c807d503beb1241ba73355a73ceca47e3e':
  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.