| commit | 88cfdae667bd85931c1bf81781a54472a8fe3ac7 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Sep 10 15:14:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 10 15:14:42 2013 -0700 |
| tree | 703c684bc44f5dd1e4e2f89be22a8d7648ca0a19 | |
| parent | 53760b4a97fb2f88e94da73d647ff80221b3c454 [diff] | |
| parent | cdd82540f2f98e7b4374fdd81e771eb217a27573 [diff] |
am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev * commit 'cdd82540f2f98e7b4374fdd81e771eb217a27573': When waiting for activity to finish don't reset