tree f9291bc63cf4b9d93d24b880a22dd4458fd0e2d5
parent 035e1885fb63403b5c831500554a66b9043b1853
parent c6e952fec16c06e66a6825328304fa1dec93278b
author Mike Lockwood <lockwood@google.com> 1332374467 -0700
committer Mike Lockwood <lockwood@google.com> 1332374478 -0700

Merge commit 'c6e952f'

Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8