| commit | 370b593c37569ddad8286a47e3772bfe3cdb9c9b | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Sep 16 17:31:40 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 16 17:31:40 2013 +0000 |
| tree | 95ac66681dd58105f5514e776d11d63a30fd309d | |
| parent | fef978f389e36becb32f7d9a0dc1ce546b50d845 [diff] | |
| parent | b523bfa64d9304ef22d563f81defa48b047c623a [diff] |
Merge "Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE." into klp-dev