do not merge Bringing change https://android-git.corp.google.com/g/#change,30376 into Eclair branch

This change fixes some tests, it does not affect any code that goes on the device.

Change-Id: Ib6252ad8055de0d52d16f5be1dd03f6d9c3d4c15
1 file changed