tree 0f70f4de34950c2dcd53b6a172771bea50219427
parent 7cc40196132596a267b78d60f6e416be55251525
parent 2bfdff4a467c64a449c65e5d380ac9453cccfb76
author Zhijun He <zhijunhe@google.com> 1435081438 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435081440 +0000

Merge "CamcorderProfile: clarify the high speed profile semantics" into mnc-dev