Merge "Misc clean up."
authorXavier Ducrohet <xav@android.com>
Fri, 1 Feb 2013 00:20:20 +0000 (00:20 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 1 Feb 2013 00:20:20 +0000 (00:20 +0000)
commit604b45a0c202c551332380cba09e65520569db25
tree27f3ff09c9f498961d1f4e5959160993912d56f2
parentfe7619fba11fad0ca5cc1550d18f45c20eb8401c
parentff1cb4934b283b2ec04c88e96c471dc3ad199414
Merge "Misc clean up."