OSDN Git Service

am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge...
authorNick Kralevich <nnk@google.com>
Wed, 15 Oct 2014 02:03:37 +0000 (02:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 02:03:37 +0000 (02:03 +0000)
commita26487cb28ea6bde6157463b6c48cc45b28fe41c
treef7dafe3c9aefc7e3369d2e9c880aa5cc6d1fd538
parent3299c571118180fb6c20de53bf2b366453ccf493
parent55bb6a7b68595ee83b543eda40d191636de1831e
am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev

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