OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7403e81 73f95c4)
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)
* commit '73f95c4389ca18cc61c6171bd3650818319d2a74':
  NFC: don't use dynamic resources.


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