| commit | df7ffe824e9b7d4f260ce217a35da5fab644543c | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Thu Jul 17 23:47:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 23:47:33 2014 +0000 |
| tree | 0c754484a509b2229779f7c42dac6afdb68b02c4 | |
| parent | 393cbd5652395e0049b512f3bf8f84d5b4407398 [diff] | |
| parent | 3a065b9095e66bfe70ec799792015c763dfdf559 [diff] |
am 3a065b90: am 92e837e1: Merge "Adding videoState parameter to acceptCall method on Connection." into lmp-dev * commit '3a065b9095e66bfe70ec799792015c763dfdf559': Adding videoState parameter to acceptCall method on Connection.