tree ccb847c34945b03e3261ab092813031e70f1caad
parent 29717e60b49221554999f868432c7d977495e9a1
parent ad4025b35b5f60ca074c25ea641dfe5942defccc
author George Burgess IV <gbiv@google.com> 1519942781 +0000
committer android-build-merger <android-build-merger@google.com> 1519942781 +0000

Merge "Add a NOLINT for the memory leak we added" am: 10f62351eb am: 4e3ae2cbfa
am: ad4025b35b

Change-Id: I1d4831bc70b8874e66583f4a130b3a711c24b019