| commit | 6a98dde8dffac83283850afaec4400db9146a3e5 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Nov 05 04:50:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 04:50:50 2014 +0000 |
| tree | 56ee2e1996362ab1f8ca8a77f0cc705b641522cc | |
| parent | 53a5acd096e222e5cbab94dfa5d4c5fde257d7f7 [diff] | |
| parent | 9342b049b9a605b1904e03f904ec3cbf90f7742d [diff] |
am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev * commit '9342b049b9a605b1904e03f904ec3cbf90f7742d': Use default token instead of wrapped window manager