| commit | bc790c4ae584799a0090edfc68d01acdb8514ef4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jan 29 14:43:33 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 14:43:33 2011 -0800 |
| tree | d5686270469e6719a80275f0c3e20b9c51a92c2e | |
| parent | 2409f6b6b07ebf93343558298e366622cf7c49a1 [diff] | |
| parent | 62e5b62d7f328bbf42fc51e3514eb258c212d9fc [diff] |
am 1358b6a4: Tweak to make merges easier * commit '1358b6a4fb68e81058aa938e46b125350bdf0fff': Tweak to make merges easier