diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-06-14 09:11:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-14 09:11:32 -0700 |
| commit | febee0e4500bb5a6c273fe937bffc3c6148f6187 (patch) | |
| tree | a8a9d2edbc9cdf95c643cf3a568d18856285e851 /api | |
| parent | 76750985e6f8e82b3e0473df6a9c4cbc0d586aef (diff) | |
| parent | 49497672c68f33002a926f85b6ee34358464b91f (diff) | |
| download | prebuilts_sdk-febee0e4500bb5a6c273fe937bffc3c6148f6187.zip prebuilts_sdk-febee0e4500bb5a6c273fe937bffc3c6148f6187.tar.gz prebuilts_sdk-febee0e4500bb5a6c273fe937bffc3c6148f6187.tar.bz2 | |
am 49497672: am 60ed6894: Update 18.txt from current.txt.
* commit '49497672c68f33002a926f85b6ee34358464b91f':
Update 18.txt from current.txt.
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(); |