OSDN Git Service

Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am: fddbb1a791...
authorMarco Nelissen <marcone@google.com>
Mon, 23 May 2016 14:46:25 +0000 (14:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 May 2016 14:46:25 +0000 (14:46 +0000)
am: 748277a992  -s ours

* commit '748277a99233a764273a9356704d38a91458c704':
  DO NOT MERGE Check malloc result to avoid NPD

Change-Id: Ic1a8b9ca9793562e4da245ca8a6eb13702152a4d


Trivial merge