| commit | d6e1392b361341ad1052b38fb337e10b3255773d | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Sep 21 16:07:17 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 21 16:07:17 2011 -0700 |
| tree | 3e94d947a1f6172e181b9bda053e90550cc1d5f0 | |
| parent | 5af99fed7d98fffa824e71bd1cc49b31edfbdedb [diff] | |
| parent | aa8d1ea63cd6635c44e846815ff9dde8ca8ec0c6 [diff] |
am aa8d1ea6: DO NOT MERGE * commit 'aa8d1ea63cd6635c44e846815ff9dde8ca8ec0c6': DO NOT MERGE