OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9651e4f 6a0db59)
am 6a0db599: resolved conflicts for merge of e0b14ea7 to master
authorKenny Root <kroot@google.com>
Sat, 14 Dec 2013 00:03:18 +0000 (16:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 14 Dec 2013 00:03:18 +0000 (16:03 -0800)
* commit '6a0db5990187a71427029fb0fd64394e849aa057':
  Use java.util.Objects instead on internal API


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