| commit | c4eae8ec47b55426c8bb6b563b18be408b03b8c2 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Wed Sep 11 17:31:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 11 17:31:00 2013 -0700 |
| tree | 21e883883c2784adc954614ed5ae16622eceb980 | |
| parent | 835b5f344ba63a6c0ac9c8a7cc40052134d59b8c [diff] | |
| parent | 5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370 [diff] |
am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev * commit '5481e5fe30e3708f8a7a9ea8a1dabfa4ae050370': MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT