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