Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev

author Lajos Molnar <lajos@google.com>

Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)

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

Thu, 14 May 2015 21:17:30 +0000 (21:17 +0000)
author Lajos Molnar <lajos@google.com>
Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 14 May 2015 21:17:30 +0000 (21:17 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Lajos Molnar <lajos@google.com>
	Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 14 May 2015 21:17:30 +0000 (21:17 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history