Merge "media: document new temporal layering schema values." into nyc-mr1-dev

author Lajos Molnar <lajos@google.com>

Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)

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

Fri, 15 Jul 2016 05:44:04 +0000 (05:44 +0000)
author Lajos Molnar <lajos@google.com>
Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 05:44:04 +0000 (05:44 +0000)
diff --cc media/java/android/media/MediaFormat.java
Simple merge
author	Lajos Molnar <lajos@google.com>
	Fri, 15 Jul 2016 05:44:03 +0000 (05:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Jul 2016 05:44:04 +0000 (05:44 +0000)