commit | 8df94b5659441531d9660de637b0fa39d54e8dca | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Wed Nov 05 05:03:59 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 05:03:59 2014 +0000 |
tree | 2c07cd6e52514a93b1f844501639f17f106d4e20 | |
parent | 75cc9816cafb41fca52cc76d83c3d114a013adb5 [diff] | |
parent | b6416716ad875a800c982dda77bafe910f9ed2d6 [diff] |
am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev * commit 'b6416716ad875a800c982dda77bafe910f9ed2d6': Use default token instead of wrapped window manager