| commit | 91d9ab57cc945ffdcccd423f62a5139dd678ede1 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Sep 21 16:08:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 21 16:08:59 2011 -0700 |
| tree | 693dc9115ca203386bc1454b8d5b2ab19d006886 | |
| parent | 2b0b6a3412056af58841772b499a019a59ad0461 [diff] | |
| parent | d6e1392b361341ad1052b38fb337e10b3255773d [diff] |
am d6e1392b: (-s ours) am aa8d1ea6: DO NOT MERGE * commit 'd6e1392b361341ad1052b38fb337e10b3255773d': DO NOT MERGE