| commit | 0393890b28cb0d51f4daa9fb66063f4bb43a6aa7 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Wed May 03 21:50:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 03 21:50:48 2017 +0000 |
| tree | 7580a2761354a163b3bebb48a8c9be1c87ab622f | |
| parent | c723d7d14adbdddcdcc92cbbb3ac4ab7dbd2a563 [diff] | |
| parent | 9daa42dceb2d8fe3d7fad7fde6cc7d8a9aa0fb97 [diff] |
Merge "Confirm managed call when there are ongoing self-managed calls." into oc-dev am: ba03779236 am: 9daa42dceb -s ours Change-Id: Idf83370e38b692ec889ceb4bdeed60969182d727