summaryrefslogtreecommitdiff
path: root/services/java/Android.mk
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2012-07-11 15:18:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-07-11 15:18:14 -0700
commit64ab8fcd6f2011c0d185f2973b9615f155f6d239 (patch)
tree15109f8215440887b2383ea81a53de52c9eaec39 /services/java/Android.mk
parent7e7674489f75003b3f33244345c48f755fef88f1 (diff)
parentdcddea95301641e3dc9692ed7d70127085458a24 (diff)
am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev
* commit 'dcddea95301641e3dc9692ed7d70127085458a24': Handle keyguard visibility states separately. DO NOT MERGE
Diffstat (limited to 'services/java/Android.mk')
0 files changed, 0 insertions, 0 deletions