tree fadb1681aa4b4790d63e5820efde060240c5d529
parent 1550005c52831c5077973a45228afec8c0c139e7
parent 86c2cfa9ecfb14a125fab03e62fa03e2af58c61a
author Ruben Brunk <rubenbrunk@google.com> 1414083007 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414083007 +0000

Merge "camera2: Fix makefile for ITS in CTS build (take 2)." into lmp-sprout-dev