diff options
| author | 2014-11-05 17:38:45 +0000 | |
|---|---|---|
| committer | 2014-11-05 17:38:45 +0000 | |
| commit | 0bfb97cddfadcc0d580bca78c4368efac4edd23e (patch) | |
| tree | a67988c0dfe82674d0e569ad777793d02006c97c /libs/androidfw/ZipFileRO.cpp | |
| parent | 80a28fe8d69cbf629a6f8cca23de9fc6e7673326 (diff) | |
| parent | 4255ec5c57ace18b0a78ebcbf0d573213123e586 (diff) | |
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
automerge: 4255ec5
* commit '4255ec5c57ace18b0a78ebcbf0d573213123e586':
Support disconnecting conference participants from conference.
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions