OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca324f5 63f7fc8)
am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev
authorMartijn Coenen <maco@google.com>
Mon, 8 Jun 2015 16:42:40 +0000 (16:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jun 2015 16:42:40 +0000 (16:42 +0000)
* commit '63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9':
  NFC: don't use dynamic resources.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help