| commit | 8f4a04f04cd3696f6a5255a54464779dda94d5ba | [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 | 0cbb8322b581f3089507005486f2ab5eba0dea6b | |
| parent | 7ea919c44b05daf99c045d09eb3edafb96019da7 [diff] | |
| parent | 1358b6a4fb68e81058aa938e46b125350bdf0fff [diff] |
am 1358b6a4: Tweak to make merges easier * commit '1358b6a4fb68e81058aa938e46b125350bdf0fff': Tweak to make merges easier