OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ae9086 266e429)
am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
authorSanket Padawe <sanketpadawe@google.com>
Wed, 22 Oct 2014 20:45:40 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Oct 2014 20:45:40 +0000 (20:45 +0000)
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help