| commit | 1e310d64d1e51faf35962f23da1c90ec95a35e5d | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Tue Nov 27 12:59:56 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 12:59:56 2012 -0800 |
| tree | c360c5e50d133abd3164189264b6103e5b7fe720 | |
| parent | db2e4f16bb1c804414773862030cdb0aa5413778 [diff] | |
| parent | 2004307b65c0cb34c854331e5be21d3426a3ef06 [diff] |
am 2004307b: Merge "Create builtin display tokens on demand" * commit '2004307b65c0cb34c854331e5be21d3426a3ef06': Create builtin display tokens on demand