commit | 655a6370e4f480119e58aad6bf99d4606ae25d58 | [log] [tgz] |
---|---|---|
author | Michael Kwan <mkwan@google.com> | Fri Sep 04 16:04:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:04:32 2015 +0000 |
tree | 1a701f6edfd4017f0dd3a5479b14a6f0688c96c8 | |
parent | d78d1364f5ccc47ce3b090455b52757c2ff16fb5 [diff] | |
parent | e7fd914c35154e323136c86086f26b595cc5fc8e [diff] |
am e7fd914c: am 24b85a50: am e7e6a3ed: Merge "Changed behaviour on main Activity relaunch to finish immediately for clockwork devices to accomodate clockwork\'s exit to the watchface on screen off." into lmp-sprout-dev * commit 'e7fd914c35154e323136c86086f26b595cc5fc8e':