commit | 928048040cb5cd205ff5e74f9393dca2371c519a | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Mon Nov 03 18:31:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 18:31:17 2014 +0000 |
tree | bdc2c2688d2f61f400f8a83a75c26fd9bec76e3c | |
parent | 2589d8e12de80535defb6e8ddae5ca971a64feb5 [diff] | |
parent | 1787b4ea436f361e16c289755fa1a35c6e1c8845 [diff] |
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev * commit '1787b4ea436f361e16c289755fa1a35c6e1c8845': Fix cancel crash