tree cf8136e0e42bb7c7426d57f72f5c9969f10fb917
parent 11145938bb2b1a46432f27a0cc20fe52e254c7f2
parent 8f73a1be7c1550b791593e59d7ec787187014839
author Chong Zhang <chz@google.com> 1428632976 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428632978 +0000

Merge "MediaMetadataRetriever: add key for capture fps"