OSDN Git Service

am 73f95c43: am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources....
authorMartijn Coenen <maco@google.com>
Mon, 8 Jun 2015 17:15:05 +0000 (17:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 17:15:05 +0000 (17:15 +0000)
commit1f6ba1e8d1276223114f86833a7bf1677811c985
tree02d3cc19e07060d0029c39e838c9c5f8cbc7358f
parent7403e81601f19de589b644c4a41d8e57311c49eb
parent73f95c4389ca18cc61c6171bd3650818319d2a74
am 73f95c43: am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev

* commit '73f95c4389ca18cc61c6171bd3650818319d2a74':
  NFC: don't use dynamic resources.