Merge commit 'e34569fa54471214c3b58dd23ec17be900240a74' into eclair-plus-aosp * commit 'e34569fa54471214c3b58dd23ec17be900240a74': doc change only. fix toc links on terms page.
Merge commit 'e34569fa54471214c3b58dd23ec17be900240a74' into eclair-plus-aosp * commit 'e34569fa54471214c3b58dd23ec17be900240a74': doc change only. fix toc links on terms page.