summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2013-11-07 15:22:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-07 15:22:23 -0800
commit1bd7918fc26930935037d8c99be4c64332b9ef93 (patch)
treeac522002c422e0f0fbf28b9fe117c33aee5e49bd /core
parenteaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae (diff)
parent6bb9588d767822a70823319170160ceb28c583f2 (diff)
downloadframeworks_base-1bd7918fc26930935037d8c99be4c64332b9ef93.zip
frameworks_base-1bd7918fc26930935037d8c99be4c64332b9ef93.tar.gz
frameworks_base-1bd7918fc26930935037d8c99be4c64332b9ef93.tar.bz2
am 6bb9588d: am e81f9755: am 9dcac6f1: (-s ours) am 0fed1239: am de38b23d: DO NOT MERGE Add a delimiter between scheme and host
* commit '6bb9588d767822a70823319170160ceb28c583f2': DO NOT MERGE Add a delimiter between scheme and host
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions