diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-26 15:21:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-26 15:21:27 -0700 |
| commit | 335b606c344b2c4881636d3d13ef826c92fdea99 (patch) | |
| tree | 02609f8f45a71a21089161a293538d31eda76f87 /docs/html/sdk/api_diff/6/changes.html | |
| parent | 61c3629c8d79de9cf9d621805c4b3ca4b96f153b (diff) | |
| parent | 0ad3bb8b36d4a2532af74f80a6988bbcb5d1f663 (diff) | |
am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '0ad3bb8b36d4a2532af74f80a6988bbcb5d1f663':
Diffstat (limited to 'docs/html/sdk/api_diff/6/changes.html')
0 files changed, 0 insertions, 0 deletions