tree 5bf8fdfa919cb0778048467e47ff2d061a6ccf23
parent 8a286a32593961a4ec8dcaa26fa431735a2d51cb
parent bd621d1b2ba7eeee6348262fc2dff2c94822d06f
author Eric Laurent <elaurent@google.com> 1331764567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331764567 -0700

am bd621d1b: am 2ca7b0f4: fix issue when capturing with pre processing

* commit 'bd621d1b2ba7eeee6348262fc2dff2c94822d06f':