tree 91e563909e2b441cadda884c79ad38206153fd6d
parent aeffc9cebd4e97889f5b2f61de38c60b83535ffa
parent d2e8640c2c1972d4f2e92d48660fa9e17d9291c4
author Filip Gruszczynski <gruszczy@google.com> 1424899807 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1424899913 +0000

Merge "Burn in protection." into lmp-mr1-modular-dev