tree ae80556423907fcf51e8e48e88c1f90bc38aee2e
parent ea871a06499e7433b109852d8fdda781da7c14c2
parent d9b0e80c1d2a70dae1ce7905ff4bfd554029bb88
author keunyoung <keunyoung@google.com> 1363301967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363301968 +0000

Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev