summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-05-22 15:43:13 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-05-22 15:43:13 -0700
commit02e572140aed422ffa73e8d1c69ee22dd5f2bf80 (patch)
tree95d1eead5047bba8647b91195b04d43d75647f29
parent53cf55c64f85c11c4da4c47edddb387a396bb8b6 (diff)
parent4cf03d381b2dff908857fceff0bec445f8d44f36 (diff)
downloadframeworks_base-02e572140aed422ffa73e8d1c69ee22dd5f2bf80.zip
frameworks_base-02e572140aed422ffa73e8d1c69ee22dd5f2bf80.tar.gz
frameworks_base-02e572140aed422ffa73e8d1c69ee22dd5f2bf80.tar.bz2
Merge open-source donut back into internal tree
Merge commit '4cf03d381b2dff908857fceff0bec445f8d44f36' into HEAD
0 files changed, 0 insertions, 0 deletions