diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-23 19:20:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:20:22 +0000 |
| commit | 9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1 (patch) | |
| tree | c66b2b35c9fda8fb2b6e28e80e7e4219012fb4d9 /docs/html/sdk/api_diff/21/changes | |
| parent | 5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597 (diff) | |
| parent | b30f841cb44e132598939b0797dad41f6c0004a7 (diff) | |
am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
Touch, wake and unlock
Diffstat (limited to 'docs/html/sdk/api_diff/21/changes')
0 files changed, 0 insertions, 0 deletions