| commit | 1fcb5400b3c63d46aaabd54ba79b3fc2620dadad | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Apr 09 18:30:37 2014 -0400 |
| committer | John Spurlock <jspurlock@google.com> | Wed Apr 09 18:33:06 2014 -0400 |
| tree | 90d72b0d9b3321d6a8b87070ac558f3d0c5a20c4 | |
| parent | b01056bc38c7c2bb219bd111c1a2320f0d30cbdc [diff] | |
| parent | 3c86a27d3e9044d04d0f176e59a1ebbcd774a54c [diff] |
resolved conflicts for merge of 3c86a27d to master-lockscreen-dev Change-Id: Idcf46beb8790ff95566942d1633baf70ca5eddf8