summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/3/changes
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-08-14 19:34:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-14 19:34:14 -0700
commit595b6565dcac3af10983310dff6dcfb88b11f457 (patch)
tree6913070f6f6c1a589b8788e39a765a2108a66011 /docs/html/sdk/api_diff/3/changes
parentabac0cd16105c60fdd6c5ce37116c972dc7431bb (diff)
parent977abbb887cfaf7cd8a0d31235281fbdd639ac19 (diff)
am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"
* commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19': Keep keyguard from starting after finished call when screen is on
Diffstat (limited to 'docs/html/sdk/api_diff/3/changes')
0 files changed, 0 insertions, 0 deletions