| commit | 9d0e4708a10d99ae5c62382f2841bae629c09f45 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Tue Nov 27 18:42:41 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 18:42:41 2012 -0800 |
| tree | b847b48d6b2f5db08c74201e7a1bc0f27eba3704 | |
| parent | 9b60acdb52c87a92bc35d77e84bb88fdc63ee5c4 [diff] | |
| parent | 1e310d64d1e51faf35962f23da1c90ec95a35e5d [diff] |
am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand" * commit '1e310d64d1e51faf35962f23da1c90ec95a35e5d': Create builtin display tokens on demand