| commit | 858737d08d9a2db7ef230a17975cd4ded709c3c5 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Apr 11 01:47:08 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Fri Apr 11 01:47:08 2014 -0700 |
| tree | 416765457be593e2521f12b61388509effc8ad44 | |
| parent | d4d46587665ede9cdd26d12d37368a35232a31e1 [diff] | |
| parent | 4e5c089ef3e62e7f658e71c0be262d09bd3e399b [diff] |
resolved conflicts for merge of 4e5c089e to master-lockscreen-dev Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1