am c5ae55eb: am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4' into eclair-mr2-plus-aosp * commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4': Fix issue 2194140, Part 1.
This commit is contained in:
Merge commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4' into eclair-mr2-plus-aosp * commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4': Fix issue 2194140, Part 1.