am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

author John Spurlock <jspurlock@google.com>

Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
author John Spurlock <jspurlock@google.com>
Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
diff --cc api/current.txt
Simple merge
diff --cc include/androidfw/ResourceTypes.h
Simple merge
diff --cc libs/androidfw/ResourceTypes.cpp
Simple merge
diff --cc tools/aapt/AaptAssets.cpp
Simple merge
author	John Spurlock <jspurlock@google.com>
	Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 4 Apr 2014 19:28:09 +0000 (19:28 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/androidfw/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/androidfw/ResourceTypes.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tools/aapt/AaptAssets.cpp	patch \|	diff1 \|	diff2 \|	blob \| history