| commit | cd75373fcc49810751675bcd36bd7d7dee5055e9 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Mon Dec 01 21:23:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 21:23:16 2014 +0000 |
| tree | bd05dc246b2aa32354ea8cd1d76a40febd2c1271 | |
| parent | 7c74d779eb1fa514d270cc9a0a399e850afd7130 [diff] | |
| parent | 42536098ca6f291ff26f1d7058be520796094429 [diff] |
am 5c3e3745: Merge "Check for generic conference for showing notification." into lmp-mr1-dev * commit '5c3e3745a7e02f40a45f59070cb0a52f50a51c27': Check for generic conference for showing notification.