tree 4526b51a2a2a264ec9d450863c27cb0ee0a195d9
parent b1c453f2897a9bf7dcfe71a84512877c5c6f0536
parent 6e6e861a58da7bc39e1fbad9ed8730c712e45123
author kmccormick <kmccormick@google.com> 1364435642 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364435642 -0700

am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs

* commit '6e6e861a58da7bc39e1fbad9ed8730c712e45123':
  Doc change: Fix typo DONT_DELTE