diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-13 16:24:23 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2013-06-13 16:24:23 -0700 |
| commit | 60ed689447da99eb18a06895c4139c6dc31165d2 (patch) | |
| tree | 48821d607dd5088e206086115203874dfa24788e /api | |
| parent | ac46b3267459c832d6c6df15276b6f1a0518bc5c (diff) | |
| download | prebuilts_sdk-60ed689447da99eb18a06895c4139c6dc31165d2.zip prebuilts_sdk-60ed689447da99eb18a06895c4139c6dc31165d2.tar.gz prebuilts_sdk-60ed689447da99eb18a06895c4139c6dc31165d2.tar.bz2 | |
Update 18.txt from current.txt.
Change-Id: Idab68d219c35a5410d66a0936ad001b882100269
Diffstat (limited to 'api')
| -rw-r--r-- | api/18.txt | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -639,6 +639,7 @@ package android { 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 @@ package android.media { 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(); |