Commit ed191db3 authored Apr 23, 2015 by Quddus Chong Committed by Android Git Automerger Apr 23, 2015

am 5dafb34b: resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev

* commit '5dafb34b':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.

docs/html/reference/com/google/android/gms/fitness/data/Field.html

+715 −714

Original line number	Diff line number	Diff line
		@@ -2232,6 +2232,7 @@ From interface




		void</nobr>
		</td>
		<td class="jd-linkcol" width="100%"><nobr>