tree 0302f21c008eace548308f5170f7809d2e7d4571
parent 6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590
parent c3839d3242f6c1b38a83268dd03b78e40e6a51ab
author Elliott Hughes <enh@google.com> 1295400305 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295400305 -0800

Merge "Minor updates." into honeycomb