| commit | 3100207be5cb0ef93a5271f24b6f03a2e75291ad | [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 | b9785201b81473816814f0968720276f42e8c560 | |
| parent | 34ebb5bfec0794d5852b47edaa8b9d4cea22e515 [diff] | |
| parent | 1358b6a4fb68e81058aa938e46b125350bdf0fff [diff] |
am 1358b6a4: Tweak to make merges easier * commit '1358b6a4fb68e81058aa938e46b125350bdf0fff': Tweak to make merges easier