tree e1c6aec00ab1a6e81e0675f8882de8ae7e389beb
parent 3759ec9b2e8aea4301dd0398e5da203bdbc6f833
parent ff41393d06b43223aacf3cde6c5139b9b0d1d161
author Zhijun He <zhijunhe@google.com> 1391817582 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391817582 +0000

Merge "Camera2: Update focus distance related tags"