51b33f5da1
Merge commit '2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81' into eclair-plus-aosp * commit '2eeb1f0ed0ca9648e3a3b9120f945edd0b1a4a81': docs only.