| commit | 54664b037202d477b4cb4efb30f62684e440400f | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Mon Mar 10 14:53:29 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 10 14:53:29 2014 -0700 |
| tree | e6877c18a6eade09f86ecfb6c318332460c7cb69 | |
| parent | 14aea90adaa3c3f49d4cba70bb7e11784fe02351 [diff] | |
| parent | 83e60a262219f400410b91f3bbafbdfd81d3058a [diff] |
am 83e60a26: am c0948a44: resolved conflicts for merge of 62c86cb8 to jb-mr1-dev * commit '83e60a262219f400410b91f3bbafbdfd81d3058a': CtsVerifier test for lock screen vulnerability fix