OSDN Git Service

(root) / android-x86 / packages-apps-Launcher3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91e2dd3 d26fd29)
am d26fd29b: am 153a757a: am fdb4e69f: Mark access to private styles now that aapt...
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 19:51:32 +0000 (12:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 19:51:32 +0000 (12:51 -0700)
* commit 'd26fd29b66d76da215b5fe2ae54adbb8ec903082':
  Mark access to private styles now that aapt enforces this.

1  2 
res/values-large/styles.xml patch | diff1 | diff2 | blob | history

diff --cc res/values-large/styles.xml
Simple merge
packages/apps/Launcher3
About OSDN
Find Software
Develop Software
Help