am c646fe8b: merge from open-source master
Merge commit 'c646fe8b08544a5a317e2984f73bfa8044a97354' * commit 'c646fe8b08544a5a317e2984f73bfa8044a97354': eclair snapshot
This commit is contained in:
committed by
Android Git Automerger
commit
bf0e6067f7