tree 9c29393cb2936a445c9297840715f36de2986ee9
parent 2fa715f8b56b8f512806cbd1b3e0bf1b98c23c7e
parent 0b8df7be79d2b8b5d5a884fc2b0d070b42861459
author Conley Owens <cco3@android.com> 1352770540 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1352770540 -0800

Merge "Handle manifest parse errors in main"