Commits
Romain Guy authored and Android Git Automerger committed e557b0ca62cM
am 3d2ecafd: am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev * commit '3d2ecafd7742a93a3ca83993cf12f352aa998112': workaround to unbreak the build (deadlock during boot)
Showing diff to87540b22641