| commit | 709aab4e56d8492635e00bc27147f0314edb9779 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Mar 10 15:03:49 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 10 15:03:49 2014 -0700 |
| tree | 0a2e68403c6521bad4809f39341baa39e10a46e3 | |
| parent | 744a1bd37ddbbf9fb04b3d886e6b5caa2f706c34 [diff] | |
| parent | 9a70b0a92f5b3744832f800dd913258389f31955 [diff] |
am 9a70b0a9: am 54664b03: am 83e60a26: am c0948a44: resolved conflicts for merge of 62c86cb8 to jb-mr1-dev * commit '9a70b0a92f5b3744832f800dd913258389f31955': CtsVerifier test for lock screen vulnerability fix