tree 597742623a901b7189c9090099c866904a26d2ae
parent ad32461ec14593e57a5fb107f4796276656f2a23
parent 2fb98b147b58210604dfaf1482f635ce8d8a0575
author Craig Mautner <cmautner@google.com> 1332346899 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332346899 -0700

Merge "Minor refactoring prior to major refactoring."