tree aec35fa30a7c6618340fa2ef6d76c8c260946953
parent fb825c80ac0170fc2e5996a4fbc8f5bc8563ccae
parent 25c66c3a4a51617099e848a9376313c90a1ec9ae
author Pin Ting <pinting@google.com> 1331024275 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331024275 -0800

am 25c66c3a: Merge "Fix document." into ics-mr1

* commit '25c66c3a4a51617099e848a9376313c90a1ec9ae':
  Fix document.