| commit | dc54a8c742e96d6ea8ef3e18c0f2ee1235899599 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Fri Jan 21 11:34:20 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 21 11:34:20 2011 -0800 |
| tree | 85c92f6cb6dbf48989deb6e8206e78b9d292c73a | |
| parent | a314f32ba92d46687aef9f420eb61491eff485cf [diff] | |
| parent | 4e21e1d21a877cce4db5ec8c5786604cc10f2d7e [diff] |
Merge "API changes for NFC." into gingerbread