Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: 8184f2e545

author Clara Bayarri <clarabayarri@google.com>

Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)

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

Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)
author Clara Bayarri <clarabayarri@google.com>
Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/app/Activity.java
Simple merge
author	Clara Bayarri <clarabayarri@google.com>
	Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 16 May 2016 15:18:36 +0000 (15:18 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/Activity.java	patch \|	diff1 \|	diff2 \|	blob \| history