Commits
Romain Guy authored and Android Git Automerger committed 348cdc47933M
am f094d963: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev * commit 'f094d9639497e88ab9e544ed61e3d42b14eb7fc2':
Showing diff to41d4fde1968