| commit | 42892f8aa57cb5f577c67f17431e162c1ac505de | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Jun 18 23:50:54 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 17 21:43:29 2014 +0000 |
| tree | 676eb4226e3baf9301ab3b3287f11baf2a92bb43 | |
| parent | c4de2caaaf79303f413a2a0c0fd8cdf142c79d81 [diff] | |
| parent | 3bd90617ec07a1093139de39591a624b21468e46 [diff] |
Merge "Don't end lock task mode when not in lock task mode"