summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2010-01-11 15:30:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-11 15:30:29 -0800
commit6d40ee33f534aa31c5d9c4dbc6049275e3b754c2 (patch)
tree6a0027e59aef0eca8a8510ca6487ec941951599e /telephony/java
parent6ee699102fda033c5b8cbb844c446bf3ecf44dbf (diff)
parentf5a84f8a7f91422f698ffbea3fabf77f2f7f77c8 (diff)
downloadframeworks_base-6d40ee33f534aa31c5d9c4dbc6049275e3b754c2.zip
frameworks_base-6d40ee33f534aa31c5d9c4dbc6049275e3b754c2.tar.gz
frameworks_base-6d40ee33f534aa31c5d9c4dbc6049275e3b754c2.tar.bz2
am f5a84f8a: am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8' * commit 'f5a84f8a7f91422f698ffbea3fabf77f2f7f77c8': LayoutLib: support for custom styles.
Diffstat (limited to 'telephony/java')
0 files changed, 0 insertions, 0 deletions