tree 44d07513e02fcad3f8e64771a238d012af8d28f9
parent 54056ffc52f2b623e18c9a01dce2a6ddee049ecc
parent 51de64377b402ccfd9a10c8f51a7d4c1b3f1bcc4
author Ed Heyl <ed@google.com> 1299346289 -0800
committer Ed Heyl <ed@google.com> 1299346289 -0800

resolved conflicts for merge of 51de6437 to honeycomb-plus-aosp

Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e