OSDN Git Service

am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
authorNick Kralevich <nnk@google.com>
Tue, 14 Oct 2014 17:52:04 +0000 (17:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Oct 2014 17:52:04 +0000 (17:52 +0000)
commitfce896feaf9c26bdc3806a48ec01e6e077c5c975
treecc619d93d35675558fa66550c52435c3a4d3620a
parent34020eb6ebc619c90b9107003331a91e4d5a350e
parent0ae82b05be47df85551a1c759a93e84c8009947c
am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev

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