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