OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e5933d ccec5f0)
am ccec5f0d: resolved conflicts for merge of 02e85744 to master
authorElliott Hughes <enh@google.com>
Fri, 25 Apr 2014 16:08:43 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 16:08:43 +0000 (16:08 +0000)
* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.


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