| commit | e6e01dcd80f28df5656ffc1c2a10c37028292099 | [log] [tgz] |
|---|---|---|
| author | Jesse Wilson <jessewilson@google.com> | Tue Jan 11 15:34:04 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 11 15:34:04 2011 -0800 |
| tree | 6b7c9a23f6a7460a8721ffc1605711a92c3a6754 | |
| parent | 80266f556ec0da69c035552c5a24fb7a7254aeb8 [diff] | |
| parent | c9ed2b265a4f080e8785a1130769ecb9913a304c [diff] |
am b7ccc2d0: Merge "Expand predefined entities by default, even if coalescing is off." * commit 'b7ccc2d092e8a500f8d646a9ea0c535a1d440956': Expand predefined entities by default, even if coalescing is off.