| commit | 070cfb2da08c1cef57a20a92e0d59ddda1452a14 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Tue Sep 03 17:53:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 03 17:53:53 2013 -0700 |
| tree | 641850fa734f60fadf7abc511291335ca8d8e0db | |
| parent | 513459da2d81d925c7791ea88ccbe85efcb3c642 [diff] | |
| parent | a5259f6261ed4521d70d02328807aab34275a706 [diff] |
am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev * commit 'a5259f6261ed4521d70d02328807aab34275a706': Reader mode NFC API: move to callback model.