tree 7d03153254f46414c7d33e419a3f25ab3df234bd
parent a9c3846194b69f1bfa73066be670c9d77f6dd0d7
parent f0d68a975fc4cf0e43c94f1678a311b2ed201c92
author Scott Main <smain@google.com> 1341012162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341012162 -0700

am f0d68a97: Merge "docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877" into jb-dev

* commit 'f0d68a975fc4cf0e43c94f1678a311b2ed201c92':
  docs: Google IO bug fixes - http://b.corp.google.com/issue?id=6756248 - http://code.google.com/p/android/issues/detail?id=33877