summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-09-26 11:45:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-26 11:45:09 -0700
commita2b978bc55d5ebd8c32c41a707b5a155216ee0a5 (patch)
treeec511707311426d25e43fd87dd7ad297b10b26b0 /core/java/android
parent80c491f07ac9f6453309fcaa601e904ae80a172e (diff)
parent0122a3db313d3a7b55e0dee5eae1d7798c0d55be (diff)
downloadframeworks_base-a2b978bc55d5ebd8c32c41a707b5a155216ee0a5.zip
frameworks_base-a2b978bc55d5ebd8c32c41a707b5a155216ee0a5.tar.gz
frameworks_base-a2b978bc55d5ebd8c32c41a707b5a155216ee0a5.tar.bz2
Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions