| commit | 105d6842ec47f64f0609ce7c252d6a957c5f0241 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 04 20:30:14 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 20:30:14 2013 +0000 |
| tree | 8bdf4c3fd2f05c83362bf2534675766c6449491b | |
| parent | d59d89697d8f5fc51d129f00a566e8bb97fdc281 [diff] | |
| parent | 801131cb4142027089d61fb2e5c5701696316144 [diff] |
am 801131cb: (-s ours) Remove special-case - do not merge * commit '801131cb4142027089d61fb2e5c5701696316144': Remove special-case - do not merge