tree 557a58fd373a13d0dfeba5f9b3d9c75f2a795f89
parent 3b860faec72ea599781fd4e7f47ab39ba6ae65ed
parent de8635e4c4c9f674b52cb6041380c3ef2812630c
author Jean-Baptiste Queru <jbq@google.com> 1287751477 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1287751477 -0700

Merge de8635e4 from gingerbread-plus-aosp

Change-Id: Ice15f34cc3ab7d938d8acde1033886b2765fee9d