OSDN Git Service

Merge "cherrypick Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021 docs: catchup...
authorScott Main <smain@google.com>
Sat, 8 Jan 2011 00:41:52 +0000 (16:41 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 8 Jan 2011 00:41:52 +0000 (16:41 -0800)

Trivial merge