OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c63f98 fce896f)
am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
authorNick Kralevich <nnk@google.com>
Tue, 14 Oct 2014 19:57:50 +0000 (19:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Oct 2014 19:57:50 +0000 (19:57 +0000)
* commit 'fce896feaf9c26bdc3806a48ec01e6e077c5c975':
  Docs: adding closing bracket to un-break javadoc tokens.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help