tree fd103aa96e7aa738bb6b3330360fa078f69c1e01
parent 27e391014a1e01dcc0c6b69c8ef78a60b1c0e751
parent 0f3390f846ed5ee63e3926b78878c7b75ee2f0c0
author Katie McCormick <kmccormick@google.com> 1387219165 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387219165 +0000

am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

* commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
  Doc update: clarify version of flags.