summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDmitri Plotnikov <dplotnikov@google.com>2009-10-07 17:07:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-07 17:07:26 -0700
commitc38f6f33011e5b3b2f947bf94d8b96b97e67128c (patch)
tree5515aceb19dbbb368da04a3bcb9599f0cce5cc94 /include
parentd7ebc7a42d52063f731890f42206162c38702e0c (diff)
parentc15934f26a235a8218f9f673ebf8227acccefff2 (diff)
downloadframeworks_base-c38f6f33011e5b3b2f947bf94d8b96b97e67128c.zip
frameworks_base-c38f6f33011e5b3b2f947bf94d8b96b97e67128c.tar.gz
frameworks_base-c38f6f33011e5b3b2f947bf94d8b96b97e67128c.tar.bz2
am c15934f2: Merge change I7a57637b into eclair
Merge commit 'c15934f26a235a8218f9f673ebf8227acccefff2' into eclair-mr2 * commit 'c15934f26a235a8218f9f673ebf8227acccefff2': [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions