OSDN Git Service

am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev
authorMartijn Coenen <maco@google.com>
Mon, 8 Jun 2015 17:04:14 +0000 (17:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 17:04:14 +0000 (17:04 +0000)
commit73f95c4389ca18cc61c6171bd3650818319d2a74
treeb33d017f42d0f4a63077cca707bff08fd08e51f6
parentdf0028ec8a81f11563b2a55fc89a64430e5b8b8d
parentdcf324c0b3917c8d9007a58bc35591c75793c422
am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev

* commit 'dcf324c0b3917c8d9007a58bc35591c75793c422':
  NFC: don't use dynamic resources.