summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-08-13 14:51:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-13 14:51:52 -0700
commit87fefc449bffabebf98020f40d21d28500b1c1bb (patch)
tree26f9a38df70f298fdddf97ecd3c8ff6a2bdd687a /services/java/com/android/server/SystemServer.java
parentab69476a2be4a60ca73e1721cb46e956e87ec29a (diff)
parent1adbf6b900a621675cd1928307bb88bb2c6501e5 (diff)
downloadframeworks_base-87fefc449bffabebf98020f40d21d28500b1c1bb.zip
frameworks_base-87fefc449bffabebf98020f40d21d28500b1c1bb.tar.gz
frameworks_base-87fefc449bffabebf98020f40d21d28500b1c1bb.tar.bz2
am 1adbf6b9: (-s ours) am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '1adbf6b900a621675cd1928307bb88bb2c6501e5': Use hostname verifier directly instead of instance DO NOT MERGE
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions