| commit | cfb3185a27efeb9312ddf71f52f3a7039c4694df | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Wed Feb 25 21:47:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 21:47:12 2015 +0000 |
| tree | c7b496822e31477fa53f1d0f5ac82b5f49a78477 | |
| parent | 001f0b31b6f86a528f13dcc4e9378275f7f03a2c [diff] | |
| parent | 0fbcc7086fe742e641915ed5f097119d01613cb5 [diff] |
am 0fbcc708: am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev * commit '0fbcc7086fe742e641915ed5f097119d01613cb5': Burn in protection.