28af587a05
Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp * commit 'c642199d1d60176980e2781bb78f42dce93e1c84': Separated private from public header files.