Merge "Support Activity Transitions when activity stopped."

author George Mount <mount@google.com>

Thu, 15 May 2014 14:49:55 +0000 (14:49 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 15 May 2014 14:49:56 +0000 (14:49 +0000)
author George Mount <mount@google.com>
Thu, 15 May 2014 14:49:55 +0000 (14:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 15 May 2014 14:49:56 +0000 (14:49 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	George Mount <mount@google.com>
	Thu, 15 May 2014 14:49:55 +0000 (14:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 15 May 2014 14:49:56 +0000 (14:49 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history