summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-02-24 16:25:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-24 16:25:30 -0800
commit2f171c6e50518a750f2e43d6bf138a0d1a5e3100 (patch)
tree485b152b97bf8321fdd223f35587bb4294672be8
parent651a8f4bf939396c771facefbe1b2ab6824fdf83 (diff)
parent49b0cca8999336f55dbac789a939a3a64a740229 (diff)
downloadframeworks_native-2f171c6e50518a750f2e43d6bf138a0d1a5e3100.zip
frameworks_native-2f171c6e50518a750f2e43d6bf138a0d1a5e3100.tar.gz
frameworks_native-2f171c6e50518a750f2e43d6bf138a0d1a5e3100.tar.bz2
am 5786f5cf: Merge "Fix build." into ics-mr1
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09': Fix build.
0 files changed, 0 insertions, 0 deletions