Quick fix for app_id in strings.xml

Change-Id: I7b8172a7e5a5122a44d4daa46f25f89bc488c229
Merge commit '65ea35cab0631a0dc122099bd49529f61979c02e' into HEAD
Leaving room when an invitation is not accepted

Change-Id: I2a506881cc7ac320fe2ec9dd54eb6849f52a91ad
Merge remote-tracking branch 'goog/master' into github_live
Leaving room when an invitation is not accepted

Change-Id: I0c51c8ed94fafbebee2371dccc24c22e9f4773fd
Merge remote-tracking branch 'goog/master' into github_live
Fix merge conflict

Change-Id: Ie76fca6965f682e8f8e646c8d329316c6973c32c