tree 162614491fc4af907c7ade19a655a6bd7e827e16
parent c9c199a51a537cfc2aad43c06ecdeaceb8f8b698
parent b0aa2f53681ffd78b12f393eb7cb72b6ea4be0bb
author Fabrice Di Meglio <fdimeglio@google.com> 1336167558 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336167558 -0700

Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev