tree bdd8072594a5595db5c6a39ce3153502ab4b7452
parent 8c63f98be5c35e0136eebbf4b5890de535fbfdf5
parent fce896feaf9c26bdc3806a48ec01e6e077c5c975
author Nick Kralevich <nnk@google.com> 1413316670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413316670 +0000

am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev

* commit 'fce896feaf9c26bdc3806a48ec01e6e077c5c975':
  Docs: adding closing bracket to un-break javadoc tokens.