| commit | 5fff523a2c391cb2168f3c4cabf9dcbb0c661d5a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 16:06:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 16:06:21 2012 -0700 |
| tree | 0ba53498e876cb4fb0c221358af25a5b40ae0375 | |
| parent | cbf7ea8870c4730a486d9901cc01f1f9b44244d7 [diff] | |
| parent | e2bf4f19a689cda1acaa7042bcf22788684e2496 [diff] |
am e2bf4f19: am 26106360: (-s ours) Merge "Check the parent for null in deleteEditor" * commit 'e2bf4f19a689cda1acaa7042bcf22788684e2496': Check the parent for null in deleteEditor