tree 48567a586cd6379c477e81adbd642a7cde247ea1
parent 3ef2c0265439af10145be981407d63504e14d9f7
parent 2c1669c427826fba48ae7776e34f90cdcc5a3a20
author Dirk Dougherty <ddougherty@google.com> 1359754055 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359754055 -0800

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 Dirk Dougherty (1)
* commit '2c1669c427826fba48ae7776e34f90cdcc5a3a20':
  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.