diff options
| author | Nick Kralevich <nnk@google.com> | 2010-08-30 14:29:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 14:29:13 -0700 |
| commit | 81ff156bea2804d689fed98b076c2cea0928d752 (patch) | |
| tree | 09fb30b7baa139c643ca2aaee503beebbf2ac6ef | |
| parent | 44db990d3a4ce0edbdd16fa7ac20693ef601b723 (diff) | |
| parent | 2ad6067ce491446ab22f59a363d36575a942f5c7 (diff) | |
| download | system_core-81ff156bea2804d689fed98b076c2cea0928d752.tar.gz system_core-81ff156bea2804d689fed98b076c2cea0928d752.tar.bz2 system_core-81ff156bea2804d689fed98b076c2cea0928d752.zip | |
am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread
* commit '2ad6067ce491446ab22f59a363d36575a942f5c7':
do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
0 files changed, 0 insertions, 0 deletions