| commit | 740e0726006ee997101dc6c66ed9c186bb80f529 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 20 02:59:48 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 02:59:48 2015 +0000 |
| tree | 93a09fa5c945ce7864d3e0be42ecb7283698bf06 | |
| parent | 7aeb11db61a6b64dfb2aa37632aad00590c00810 [diff] | |
| parent | f96895a2129adee65179d74b3afd4fa497f8ef82 [diff] |
Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 * commit 'f96895a2129adee65179d74b3afd4fa497f8ef82':