OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9d878e 04f3698)
am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth...
authorRob Fletcher <rfletch.vol@gmail.com>
Thu, 6 Mar 2014 22:41:29 +0000 (22:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 22:41:29 +0000 (22:41 +0000)
* commit '04f3698345f804848ea7f03c6022dbdb0d8ac28d':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946


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