tree c9372ca32c5aaf2b401b835d66ad2cc421523852
parent 9186900f54014deddb0bab1455852a4ce7f678ba
parent 9520d6af5a2a00333af0244b6cbe3a9e27513bb6
author Robert Greenwalt <rgreenwalt@google.com> 1311784020 -0700
committer Robert Greenwalt <rgreenwalt@google.com> 1311784020 -0700

resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp

Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3