tree aa66707d90b4b52993fa40a9961af071ef8db218
parent 61963e88d9af350ce46b135e3fc850e738e14830
parent 7e553e15d9f903f01e7038bd691aaa94e4524b97
author Scott Kennedy <skennedy@google.com> 1358297534 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358297534 -0800

am 7e553e15: am d50a0383: am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev

* commit '7e553e15d9f903f01e7038bd691aaa94e4524b97':
  docs: Another fix for external 42607