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