tree e9c75bfa48b1b9e54d36db5554f0afdac48fa98d
parent f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74
parent 845ed8fdaa34d0f684c93bf4dbadb9162f769235
author Jesse Hall <jessehall@google.com> 1358202855 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358202855 -0800

am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
  DisplayDevice: initialize mDisplayToken correctly