| commit | 4b396d81bcccb921b67d64f502bb287ae0603083 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Sep 03 10:34:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 03 10:34:45 2013 -0700 |
| tree | b890f0ceeeff22e09db86ecc52a2f5bd10cb7067 | |
| parent | 402848c130470dfee8c1d7dbd000af6d924383fd [diff] | |
| parent | 2b8511c1531c1b213f2a23d23772eb8df550cc5a [diff] |
am 2b8511c1: am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev * commit '2b8511c1531c1b213f2a23d23772eb8df550cc5a': NFC Tap&Pay: deal with changes from API review.