commit | 0fbcc7086fe742e641915ed5f097119d01613cb5 | [log] [tgz] |
---|---|---|
author | Filip Gruszczynski <gruszczy@google.com> | Wed Feb 25 21:40:38 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 21:40:38 2015 +0000 |
tree | 2a9c155aefb7515613e5ba75196f93bba9bfc550 | |
parent | 892609ad34145e6418e42c683428f1a880b4c874 [diff] | |
parent | 1e74b5d6b0e964b7a9e58e64b45f50aec15b1178 [diff] |
am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev * commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178': Burn in protection.