Merge "Revert "Update layoutlib following Change Id10ca97f on FontFamily""

author Colin Cross <ccross@android.com>

Fri, 20 Jan 2017 04:04:27 +0000 (04:04 +0000)

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

Fri, 20 Jan 2017 04:04:31 +0000 (04:04 +0000)
author Colin Cross <ccross@android.com>
Fri, 20 Jan 2017 04:04:27 +0000 (04:04 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 04:04:31 +0000 (04:04 +0000)
diff --cc tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
Simple merge
author	Colin Cross <ccross@android.com>
	Fri, 20 Jan 2017 04:04:27 +0000 (04:04 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Jan 2017 04:04:31 +0000 (04:04 +0000)