tree fcf60e712c8ec063d65d20af892cd7fd3e822c75
parent 5292656c7ae880931501a6dbaf6b901d0921a8a3
parent 05bfbc458c842d86ba855e50ff75e10498cab009
author Robert Greenwalt <rgreenwalt@google.com> 1308597324 -0700
committer Robert Greenwalt <rgreenwalt@google.com> 1308597324 -0700

resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp

Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713