OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0cf74b 47c23a2)
am 47c23a22: resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Wed, 1 Oct 2014 20:58:10 +0000 (20:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 20:58:10 +0000 (20:58 +0000)
* commit '47c23a228deb2fa2e7158c58fc42441e8517ea38':
  Use std::sort instead of qsort_r wrapper.


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