commit | 352e108259bcb3305f034cfb042287d43a5e8f80 | [log] [tgz] |
---|---|---|
author | Dan Sandler <dsandler@android.com> | Mon Apr 14 17:54:21 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 14 17:54:22 2014 +0000 |
tree | 9335c30335ee0082a86bbdeb3fb5fdd75dfe24fc | |
parent | db8b130a19484cb6018667905e64d42ab793654f [diff] | |
parent | f3e3140696ca775fe2f62868addb1eec2b1c18fa [diff] |
Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"