OSDN Git Service

Merge "Fix a nullness warning." am: b37e81d3cd am: 10b5a9d3f6
authorYunlian Jiang <yunlian@google.com>
Tue, 11 Oct 2016 19:48:01 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 19:48:01 +0000 (19:48 +0000)
am: ea4f981031

Change-Id: Ie1fd127b89e6bc37514b05051708e69f37ae95f9


Trivial merge