OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04f0fb2 25e4932)
am 25e49323: am 8f37d4bc: (-s ours) am 8505d4a5: Merge "Disable voice input if assist...
authorJorim Jaggi <jjaggi@google.com>
Thu, 27 Aug 2015 20:16:41 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:16:41 +0000 (20:16 +0000)
* commit '25e493239ea5b1dec98df8f987695a7fa299df79':


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