summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Millar <emillar@google.com>2010-06-21 12:09:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-21 12:09:40 -0700
commita2f89660b4d427c34884109cf70655f20d84d2ad (patch)
tree9d52c784ebd68acfc44a2cdb06d7cf057bba2c91
parent5adc399c76f432ce3301db5fa1da511351b70373 (diff)
parentf9b7c243a4aade68347fafc5f83aa37196723cc9 (diff)
downloadframeworks_native-a2f89660b4d427c34884109cf70655f20d84d2ad.zip
frameworks_native-a2f89660b4d427c34884109cf70655f20d84d2ad.tar.gz
frameworks_native-a2f89660b4d427c34884109cf70655f20d84d2ad.tar.bz2
Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
0 files changed, 0 insertions, 0 deletions