OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11cb4c0 1e2efa6)
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
authorBart Sears <bsears@google.com>
Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jan 2012 21:47:09 +0000 (13:47 -0800)

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