tree 06bbd40083a1bfe3694b0ba46f58f71878d9c2b4
parent 3747c48ab87a0b99f19fb45c95ac990693248dda
parent e38fb359a957afe53ff4508a73b9b0e05f2a739e
author The Android Open Source Project <initial-contribution@android.com> 1279646915 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279646915 -0700

am fcff6910: merge from open-source master

Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed