| commit | f07f1a702d8743e78f26781873da1ae0ee76e1ef | [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 | 9361d18504012a6e8301a070631ee531531a2b72 | |
| parent | e789dbf2f84b11a2f79f600edaf2deef06d62617 [diff] | |
| parent | 2f7f221914777b6a9827bac738456083e364d4f6 [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.