Merge "docs: Add new classes to Wearable UI library" into lmp-docs

author Ricardo Cervera <rcervera@google.com>

Wed, 10 Dec 2014 00:56:49 +0000 (00:56 +0000)

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

Wed, 10 Dec 2014 00:56:50 +0000 (00:56 +0000)
author Ricardo Cervera <rcervera@google.com>
Wed, 10 Dec 2014 00:56:49 +0000 (00:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Dec 2014 00:56:50 +0000 (00:56 +0000)
diff --cc docs/html/training/wearables/apps/layouts.jd
Simple merge
author	Ricardo Cervera <rcervera@google.com>
	Wed, 10 Dec 2014 00:56:49 +0000 (00:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Dec 2014 00:56:50 +0000 (00:56 +0000)