am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and...
am 5481e5fe: am 03cd51cd: Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-dev
* commit '5481e5fe':
MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT