| commit | 2b093e93f56f008413665e876a6189921a4a57b3 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Nov 15 18:04:10 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 15 18:04:10 2011 -0800 |
| tree | 31436cb4e72f4a4bce9afeb0bfab0e455a9510a0 | |
| parent | f4226b69c9e19d0329069b39d8ae2774fcbf88d1 [diff] | |
| parent | fc87b4294aa0a2c85c2332a4c5229161a83961d8 [diff] |
Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1