| commit | de3b8ebe872d06225ac51e3728cb20588021cc97 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Oct 14 21:18:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 14 21:18:41 2010 -0700 |
| tree | e44a9222f8a53d8bafecfa4fad9751e557134a8d | |
| parent | fa0627876577b7347d1b10e15f26efb826bd81fb [diff] | |
| parent | ae9dfe8fe7a602487aeccd4bafae831b2cbbfe4c [diff] |
am 6066da89: (-s ours) am 590b73bc: NFC API revision round 2. Merge commit '6066da89a464d2bd5f002f5e687d40876ed5ce21' * commit '6066da89a464d2bd5f002f5e687d40876ed5ce21': NFC API revision round 2.