OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c127d65) | patch
resolve merge conflicts of 94ab88228e to master.
authorMark Salyzyn <salyzyn@google.com>
Tue, 22 Dec 2015 21:02:39 +0000 (13:02 -0800)
committerMark Salyzyn <salyzyn@google.com>
Mon, 28 Dec 2015 19:20:24 +0000 (11:20 -0800)
commit6eb1a3e8c68fdbb9522679dabdc75168eb2c6e55
tree6ebf1a68c97f28a7531ee43edfed42bb8763fdcftree | snapshot
parentc127d656b50b6dfd20548abde175840947b639f6commit | diff
resolve merge conflicts of 94ab88228e to master.

Bug: 26178938
Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45
packages/SettingsLib/res/values/arrays.xml diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help