| commit | d4d46587665ede9cdd26d12d37368a35232a31e1 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Apr 10 22:41:05 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Thu Apr 10 22:41:05 2014 -0700 |
| tree | ddb0421962d0e2fd3500ea9d57a31f9b32aac23d | |
| parent | 923914bc5b4f48e2524d106527adacc5502ac2b9 [diff] | |
| parent | 90b39abaf95640021d15be70b5841abe8366b33e [diff] |
resolved conflicts for merge of 90b39aba to master-lockscreen-dev Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b