| commit | ea53473802fc6cf3d512c6d00a9355dfa9bab143 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Aug 27 05:06:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:06:56 2015 +0000 |
| tree | 9d4820a3e765b60ef9ce75e94cc2c016e00485f8 | |
| parent | 07c68e644ad862969978b86e45ddf3f648e32da8 [diff] | |
| parent | 6573607b5223bc03261cc1fadf2831a716446d73 [diff] |
am 6573607b: (-s ours) am a407eaae: Merge "Fix Mifare Classic presence check." * commit '6573607b5223bc03261cc1fadf2831a716446d73':