am c02bfe5e: merge from open-source master
Merge commit 'c02bfe5e77b84b82f3830f00554be5e735486850' * commit 'c02bfe5e77b84b82f3830f00554be5e735486850': eclair snapshot Part 2 of 2 for merge ofec59a8834bto workaround a git issue Part 1 of 2 for merge ofec59a8834bto workaround a git issue
This commit is contained in:
committed by
Android Git Automerger
commit
937e5405f7