diff options
| author | Lajos Molnar <lajos@google.com> | 2015-01-10 01:25:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 01:25:55 +0000 |
| commit | f3694fc139525ae45955087a0e4f15a15ed6e202 (patch) | |
| tree | 21e6e33ab8a2428deb62725d563d8d3985acfe2b /core/java/android/content/SyncContext.java | |
| parent | 117ba186d1d28ae7eb6d1187c795e502668fa9b4 (diff) | |
| parent | 98840f2bd2fb96225ed5c95644937d55d4189ca6 (diff) | |
| download | frameworks_base-f3694fc139525ae45955087a0e4f15a15ed6e202.zip frameworks_base-f3694fc139525ae45955087a0e4f15a15ed6e202.tar.gz frameworks_base-f3694fc139525ae45955087a0e4f15a15ed6e202.tar.bz2 | |
am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec"
* commit '98840f2bd2fb96225ed5c95644937d55d4189ca6':
media: add support for 160-byte image info in MediaCodec
Diffstat (limited to 'core/java/android/content/SyncContext.java')
0 files changed, 0 insertions, 0 deletions