OSDN Git Service

Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9
authorGeorge Burgess IV <gbiv@google.com>
Wed, 14 Dec 2016 23:49:07 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 23:49:07 +0000 (23:49 +0000)
am: 85785b557a

Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb


Trivial merge