Merge "Minor documentation changes." into dalvik-dev