OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a8681a 268ffed)
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
authorAlex Cheung <alexcheung@google.com>
Wed, 23 Dec 2015 22:49:50 +0000 (14:49 -0800)
committerAlex Cheung <alexcheung@google.com>
Wed, 23 Dec 2015 22:49:50 +0000 (14:49 -0800)

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