summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-06-16 18:18:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-16 18:18:47 -0700
commitb56c8ac8b76a3f2e7e49257674771d9ba296e50e (patch)
tree1f0b1d7d6996e90aab11abbb13b499be2ca987b2
parent1c4438243d58b9844bd7406aa2f0a75029ca9743 (diff)
parent3b916233cbbbcc5bbc703213af5e647910956cbc (diff)
downloadframeworks_base-b56c8ac8b76a3f2e7e49257674771d9ba296e50e.zip
frameworks_base-b56c8ac8b76a3f2e7e49257674771d9ba296e50e.tar.gz
frameworks_base-b56c8ac8b76a3f2e7e49257674771d9ba296e50e.tar.bz2
am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc': Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
0 files changed, 0 insertions, 0 deletions