commit | c9e15f6efede03f2ccacaae6ac1956944324ee32 | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Wed Jul 29 11:08:33 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 11:08:33 2015 +0000 |
tree | ca0f47107d6aae4fc7ebb795356f104e76361083 | |
parent | 09109567e9816d20f51b5ce0175751116836635f [diff] | |
parent | 54d7c4c85ae41893d9048e9e10d33b6826d0e04f [diff] |
am 54d7c4c8: am 619b37a3: am ef3614eb: am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev * commit '54d7c4c85ae41893d9048e9e10d33b6826d0e04f': Resource for setting default NFC payment component.