diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-11-12 00:24:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-12 00:24:43 +0000 |
| commit | a4738781584d58e133fc4d0f55d9b7ebcb246ff6 (patch) | |
| tree | acdac766438a7f831fecac85e753add7e93fc1c7 /docs/html/sdk/api_diff/12/changes | |
| parent | be6c125783686be593e958725249ffcff5717fc4 (diff) | |
| parent | c1275e72eceb171544aaf517f0cb6e3d1cbd9e08 (diff) | |
am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
automerge: c1275e7
* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
Move device admin max screen off timeout to internal interface.
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions