| commit | 3f339d819309bd42ed757438f9e3589385a199e4 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Sep 10 15:17:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 10 15:17:23 2013 -0700 |
| tree | 6363635edf1f75c2bf8d55ae3554e8c6ba9091c1 | |
| parent | 2f93af4574fbca9c94679744114ce40496aa69b8 [diff] | |
| parent | 88cfdae667bd85931c1bf81781a54472a8fe3ac7 [diff] |
am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev * commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7': When waiting for activity to finish don't reset