OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66b96b5 39b9918)
am 39b99186: am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
authorAlex Klyubin <klyubin@google.com>
Wed, 1 Apr 2015 20:48:17 +0000 (20:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Apr 2015 20:48:17 +0000 (20:48 +0000)
* commit '39b9918631061340361b7776ace9b9cd4b25be7c':
  Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.


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