summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff
diff options
context:
space:
mode:
authordcashman <dcashman@google.com>2014-12-01 23:59:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 23:59:50 +0000
commit6ec2cbd8d2b26714d5771e5560bdd2b5b042287b (patch)
treece057746c26239e853d8972cdf9b712612335488 /docs/html/sdk/api_diff
parent7dedb1242567061b5651c671a221185b1ba901c8 (diff)
parentc25cfc57e0d863b002620f5e7dd14822418c678f (diff)
am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."
* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f': Prevent EntropyMixer from registering with service manager.
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions