| commit | f3e3140696ca775fe2f62868addb1eec2b1c18fa | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Apr 11 23:25:40 2014 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Fri Apr 11 23:26:00 2014 +0200 |
| tree | 0f90097b958db3d87356749abddf677de989d788 | |
| parent | fd7d31087bcd40b825b0eee3058e2298d8648e9f [diff] | |
| parent | b755253f284e237f6bafc534e85fad74f66df8bd [diff] |
Merge remote-tracking branch 'goog/master-lockscreen-dev' Bug: 13635952 Change-Id: Iae69d798155e3aa7e8d94de45977115e16ec66de