OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0ca9cd 1aa9565)
resolved conflicts for merge of 1aa9565c to master
authorNick Kralevich <nnk@google.com>
Mon, 7 Jul 2014 23:27:42 +0000 (16:27 -0700)
committerNick Kralevich <nnk@google.com>
Mon, 7 Jul 2014 23:27:42 +0000 (16:27 -0700)
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba


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