| commit | ae9dfe8fe7a602487aeccd4bafae831b2cbbfe4c | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Oct 12 19:00:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 19:00:54 2010 -0700 |
| tree | 1ad98182fc998d6cd5cac18ea8be029f1d5de2fe | |
| parent | 5511fed2a49bfe31c9bf7ab8bcacf243c78bf44b [diff] | |
| parent | c2dc99c3ca0269075227f9e7ff7b70b259634051 [diff] |
am 590b73bc: NFC API revision round 2. Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp * commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6': NFC API revision round 2.