diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-11 09:57:05 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2010-10-11 09:57:05 -0700 |
| commit | 569a4bbae11789dd00412355f238b0a32d75a8df (patch) | |
| tree | 1a348c3ce416033305188bc099496275e0240d13 /voip | |
| parent | ac0ed70cc76be87260da4f7c595bd0df7a13b864 (diff) | |
| parent | 42dd7ec9f03f169d373c3753d52eb5632ab5b142 (diff) | |
| download | frameworks_base-569a4bbae11789dd00412355f238b0a32d75a8df.zip frameworks_base-569a4bbae11789dd00412355f238b0a32d75a8df.tar.gz frameworks_base-569a4bbae11789dd00412355f238b0a32d75a8df.tar.bz2 | |
resolved conflicts for merge of 42dd7ec9 to master
Change-Id: Id388745d7ec22c48b34b744d5a4c07097cf2650b
Diffstat (limited to 'voip')
0 files changed, 0 insertions, 0 deletions