commit 60ed689447da99eb18a06895c4139c6dc31165d2
author Dirk Dougherty <ddougherty@google.com> Thu Jun 13 16:24:23 2013 -0700
committer Dirk Dougherty <ddougherty@google.com> Thu Jun 13 16:24:23 2013 -0700
tree 48821d607dd5088e206086115203874dfa24788e
parent ac46b3267459c832d6c6df15276b6f1a0518bc5c

Update 18.txt from current.txt.

Change-Id: Idab68d219c35a5410d66a0936ad001b882100269

api/18.txt

diff --git a/api/18.txt b/api/18.txt
index 092fe16..02b95a0 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -639,6 +639,7 @@
     field public static final int layout = 16842994; // 0x10100f2
     field public static final int layoutAnimation = 16842988; // 0x10100ec
     field public static final int layoutDirection = 16843698; // 0x10103b2
+    field public static final int layoutMode = 16843738; // 0x10103da
     field public static final int layout_above = 16843140; // 0x1010184
     field public static final int layout_alignBaseline = 16843142; // 0x1010186
     field public static final int layout_alignBottom = 16843146; // 0x101018a
@@ -11883,6 +11884,7 @@
     ctor public MediaExtractor();
     method public boolean advance();
     method public long getCachedDuration();
+    method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
     method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
     method public int getSampleFlags();
     method public long getSampleTime();