| commit | fce896feaf9c26bdc3806a48ec01e6e077c5c975 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Oct 14 17:52:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:52:04 2014 +0000 |
| tree | cc619d93d35675558fa66550c52435c3a4d3620a | |
| parent | 34020eb6ebc619c90b9107003331a91e4d5a350e [diff] | |
| parent | 0ae82b05be47df85551a1c759a93e84c8009947c [diff] |
am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev * commit '0ae82b05be47df85551a1c759a93e84c8009947c': Docs: adding closing bracket to un-break javadoc tokens.