| commit | 2d4deb580ae7ded601c1d5f05498cb16252ed39e | [log] [tgz] |
|---|---|---|
| author | Prerepa Viswanadham <dham@google.com> | Tue Mar 24 18:03:56 2015 -0700 |
| committer | Prerepa Viswanadham <dham@google.com> | Tue Mar 24 18:03:56 2015 -0700 |
| tree | 59b9052f442ee026f9e34382d43cb7dab04c04f5 | |
| parent | 3d05da65a8e488be546b9cef2f44e1a5567132ad [diff] |
Fix merge conflicts in CallAudioManager and CallsManager. Update a call to a hidden platform ctor in SimpleTelecomTest. Change-Id: I76f6d0b9c49862b9412196ce2ea4d3e3ed960357