Merge "Partial revert of cl/170369554 to fix video call ringing screen" am: 589db3a4b3 am: 3502faa3be
am: 8f7a8ee546

Change-Id: I44b6f8c61d42ca3a9caf054d3b3e6fc698aaecf5
tree: f093da93b49eec5f3f3a6778526e7efda222a286
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE