tree 7120b73c65527dd77bd2c39980b8432fd97604f5
parent 5fd6deb0497d6763514f125b5fde69ee4efdc3c2
parent 3fe7ee651db0aae9485ead227c89db1e24b9e245
author Eric Laurent <elaurent@google.com> 1331943565 -0700
committer Eric Laurent <elaurent@google.com> 1331943565 -0700

resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122