Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev

author Sudheer Shanka <sudheersai@google.com>

Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +0000)

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

Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +0000)
author Sudheer Shanka <sudheersai@google.com>
Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +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 services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Sudheer Shanka <sudheersai@google.com>
	Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 20 Apr 2017 17:01:24 +0000 (17:01 +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
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history