summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2012-05-29 06:30:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-29 06:30:41 -0700
commit8f6411888d9456b1c16f25d94eb56c7bf05d877e (patch)
tree2321f18d5ed4abed19e923661d21e98fee20a8ef /docs/html/sdk/api_diff
parent47faa92c62b16d46c6a7944450cb5283e1b3445b (diff)
parentd965019105a4a6bb4c924fe063b4c69c4b8020a6 (diff)
am d9650191: am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
* commit 'd965019105a4a6bb4c924fe063b4c69c4b8020a6': Moved setting the flag to suppress face unlock during a phone call
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions