OSDN Git Service

Merge "Burn in protection." into lmp-mr1-modular-dev
authorFilip Gruszczynski <gruszczy@google.com>
Wed, 25 Feb 2015 21:30:07 +0000 (21:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Feb 2015 21:31:53 +0000 (21:31 +0000)

Trivial merge