OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f07fb80 8a4dda6)
am 8a4dda67: (-s ours) am c1bef743: Prevent monkey from changing adoptable storage...
authorGuang Zhu <guangzhu@google.com>
Thu, 27 Aug 2015 11:33:50 +0000 (11:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:33:50 +0000 (11:33 +0000)
* commit '8a4dda678668c211f512122fa2617fdafb8a2fcb':


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help