Commits
Jeff Brown authored and Android Git Automerger committed 6664a94b992M
am 335b606c: am 0ad3bb8b: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev * commit '335b606c344b2c4881636d3d13ef826c92fdea99':
Showing diff to6d6463c92e1