diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-07 15:00:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 15:00:05 -0800 |
| commit | eee12419384067797c1b672a3a07e81dc2315a84 (patch) | |
| tree | 410b12ebdc9177baa25efd82074dc400e4dd072c /docs/html/sdk/sdk_toc.cs | |
| parent | 9e2cf49fa360e70b33a870e9ae0b3eec11752972 (diff) | |
| parent | 04ea2d98afb4f84f857dd343fd045fd636d86f54 (diff) | |
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0
Diffstat (limited to 'docs/html/sdk/sdk_toc.cs')
0 files changed, 0 insertions, 0 deletions