tree 3258074d4443b689923cd956eb5563c645aba399
parent dd00377282313e756aab5f9f2db0472600caa80a
parent 1c9ba65e447104bfcdbe0cb16a9f3cc5bad2da39
author Max Spector <mspector@google.com> 1456209981 +0000
committer android-build-merger <android-build-merger@google.com> 1456209981 +0000

Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483f6 am: 032fcf3034 am: c802d2091a am: 81b6cc61f0
am: 1c9ba65e44

* commit '1c9ba65e447104bfcdbe0cb16a9f3cc5bad2da39':
  Fixing safteynet logging bug introduced in ag/862848