Merge from AOSP

Change-Id: Iae692bc1c54ffc241fd6853bbbdab19688c4f46b
This commit is contained in:
Jean-Baptiste Queru 2012-04-25 09:33:13 -07:00
commit 75878eccc2

Diff Content Not Available