| commit | 925b0fac429115ed9dd5d34470d4acde64a99447 | [log] [tgz] |
|---|---|---|
| author | Michael Kwan <mkwan@google.com> | Fri Sep 04 16:15:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 16:15:50 2015 +0000 |
| tree | 2e4741ebb3a3f8700faa8bdf2536553d25cf6f01 | |
| parent | 2c671218e797bbac172332e27cc2012bfb9a8554 [diff] | |
| parent | 655a6370e4f480119e58aad6bf99d4606ae25d58 [diff] |
am 655a6370: 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 '655a6370e4f480119e58aad6bf99d4606ae25d58':