OSDN Git Service

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


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