commit | b6416716ad875a800c982dda77bafe910f9ed2d6 | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Wed Nov 05 04:56:40 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 04:56:40 2014 +0000 |
tree | 87e73efeacaf1a65f3ff4fae4224372eb85d9e5d | |
parent | dda730646e82125aecaae60480fb12ffbcb24c24 [diff] | |
parent | 6a98dde8dffac83283850afaec4400db9146a3e5 [diff] |
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