diff options
| author | Adam Powell <adamp@google.com> | 2010-09-30 13:29:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-30 13:29:36 -0700 |
| commit | fdc624aaa7f8218b71bbbf8f8a2814ee4867af74 (patch) | |
| tree | 96ce09cbb69105603f09d417748aaf7c8c375b0a /voip | |
| parent | 55ca691006c7e049ed929246d9a84032849afca8 (diff) | |
| parent | 64e2b7189389118bb5309de3060c856377c0d6de (diff) | |
| download | frameworks_base-fdc624aaa7f8218b71bbbf8f8a2814ee4867af74.zip frameworks_base-fdc624aaa7f8218b71bbbf8f8a2814ee4867af74.tar.gz frameworks_base-fdc624aaa7f8218b71bbbf8f8a2814ee4867af74.tar.bz2 | |
Merge "resolved conflicts for merge of 6e9a021e to master"
Diffstat (limited to 'voip')
0 files changed, 0 insertions, 0 deletions