tree c29d8b9469ce0c7db3802c5dceb12b67ae366432
parent 987d80fc3db1125ed99c79c46ab4342842e8a87f
parent 71bda814daae86d976412472376c2e3fbc4a27ac
author Max Spector <mspector@google.com> 1456266194 +0000
committer android-build-merger <android-build-merger@google.com> 1456266194 +0000

Merge "Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"" into mnc-dev am: 957c386860 am: 00ff259b1a am: 1f9691a159 am: 2d758217fd  -s ours am: 3598b0890d
am: 71bda814da  -s ours

* commit '71bda814daae86d976412472376c2e3fbc4a27ac':
  Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"