| commit | 0fffe1b208a02ce7fd3fed7ba718df8df869ad22 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jan 29 14:32:04 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 14:32:04 2011 -0800 |
| tree | b60da6c8c40f73796fb700626b8917375c7b4041 | |
| parent | 39e41351f0de86649a70b4a13ddf0f5858e52eeb [diff] | |
| parent | 62e5b62d7f328bbf42fc51e3514eb258c212d9fc [diff] |
am 1358b6a4: Tweak to make merges easier * commit '1358b6a4fb68e81058aa938e46b125350bdf0fff': Tweak to make merges easier