| commit | e2bf4f19a689cda1acaa7042bcf22788684e2496 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 16:04:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 16:04:18 2012 -0700 |
| tree | 819d8c1c0c5f92927b02148a2cdba859e1ae4c08 | |
| parent | b1f5446e93629ac59ad0cf8c9aebb269a6fa3cd2 [diff] | |
| parent | 261063609aa80010baad4dffe591f2f28b8a0f67 [diff] |
am 26106360: (-s ours) Merge "Check the parent for null in deleteEditor" * commit '261063609aa80010baad4dffe591f2f28b8a0f67': Check the parent for null in deleteEditor