am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand"

* commit '1e310d64d1e51faf35962f23da1c90ec95a35e5d':
  Create builtin display tokens on demand
This commit is contained in:
Jesse Hall 2012-11-27 18:42:41 -08:00 committed by Android Git Automerger
commit 9d0e4708a1

Diff Content Not Available