tree ff56fdd467d806eb024ad6cd84d9fe906616084a
parent 7e1ce27c08ec57032520613488ec2fe5b3795126
author Jean-Baptiste Queru <jbq@google.com> 1295624975 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1295625036 -0800

Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge

This reverts commit 7e1ce27c08ec57032520613488ec2fe5b3795126, reversing
changes made to 7dfc1270967c96be6dcd58fb7770c07482a7e90d.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683