tree 506eb3c9372d8826e679d3da0c55130a67447c10
parent ed9651c900ea2f0d67d3256080a7e7386a758d21
parent 25c66c3a4a51617099e848a9376313c90a1ec9ae
author Pin Ting <pinting@google.com> 1331024234 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331024234 -0800

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

* commit '25c66c3a4a51617099e848a9376313c90a1ec9ae':
  Fix document.