summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorUriel Rodriguez <urodriguez@google.com>2012-05-31 08:49:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-31 08:49:21 -0700
commit6e43ee6796795840819843e2693f6f3622638208 (patch)
treeb25411437cfe960e056886e274f498110a292a29 /services
parent564268f7110779951e2a1f74fe25527e4369733d (diff)
parentfa716c7b9bfe0b15725dff63a63b188fe7bc6aca (diff)
downloadframeworks_base-6e43ee6796795840819843e2693f6f3622638208.zip
frameworks_base-6e43ee6796795840819843e2693f6f3622638208.tar.gz
frameworks_base-6e43ee6796795840819843e2693f6f3622638208.tar.bz2
am fa716c7b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
* commit 'fa716c7b9bfe0b15725dff63a63b188fe7bc6aca': BUG 5457035 : Anti-spoofing : DO NOT MERGE
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions