tree 894144c092f8380d0f17d6e0014afbc89f47431f
parent 9e8ad24b83d71fb4a22ee0e8906aa3938c0c0d9e
parent d761ffd1202a46854dfb5d93d8b2b54036b5dbd6
author Brian Muramatsu <btmura@android.com> 1295646037 -0800
committer Android Code Review <code-review@android.com> 1295646037 -0800

Merge "Allow 2.3.2" into gingerbread