tree b46e7b4cc59fcb9dfea926dd40174e5295a46076
parent 1ee7eb81edd171cecb13ca96ee9405b1e2bdb9b8
parent f96892a4c13aef93c90412a1abc44a4e9cde22dc
author Alexander Hills <ahills@google.com> 1460039443 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460039443 +0000

Merge "Revert "Adds a launching activity flag to WearableExtender in NotificationCompat"" into nyc-dev