tree 795454f8d2782a5bfc45111f42dd25c62a0d624a
parent 624e02d6fdff70ef72653330cb233b2bf8c87fa6
parent e07b58506579085b62fde0771b74111b24aa27a0
author Trevor Johns <trevorjohns@google.com> 1333730575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333730575 -0700

am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1

* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article