tree 87e73efeacaf1a65f3ff4fae4224372eb85d9e5d
parent dda730646e82125aecaae60480fb12ffbcb24c24
parent 6a98dde8dffac83283850afaec4400db9146a3e5
author Alan Viverette <alanv@google.com> 1415163400 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415163400 +0000

am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev

* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager