Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be

author Christine Franks <christyfranks@google.com>

Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)
author Christine Franks <christyfranks@google.com>
Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Christine Franks <christyfranks@google.com>
	Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Apr 2017 18:04:59 +0000 (18:04 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history