| commit | c98e7fa30e4faa328c21a9b4afb6938325a049ec | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Jul 14 21:43:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 21:43:53 2015 +0000 |
| tree | 2dff500bc89a30bd3b277b929426fde4c2188212 | |
| parent | 66c8d8a353fb4fd11284c45ba5064087943ea18d [diff] | |
| parent | 07e3cbc3ad16a3dbb880590f33e8bdc1bcb166d1 [diff] |
am 07e3cbc3: am 4cfdcf5b: Touch, wake and unlock * commit '07e3cbc3ad16a3dbb880590f33e8bdc1bcb166d1': Touch, wake and unlock