tree c3e2874bd1a587319787c9e8b8e44bb74dbdf1fc
parent c026c7d70559b9f786b2c32b5c2f4f1d751a6116
parent bafcfbe778e25b65add85e1d7489e2010f8e240d
author Tyler Gunn <tgunn@google.com> 1506620483 +0000
committer android-build-merger <android-build-merger@google.com> 1506620483 +0000

Merge "Fix crash issue due to NPE when two calls are merged" am: 9296aa05bc am: 152dbfaa53
am: bafcfbe778

Change-Id: I48b0adfc8a9c426d088a8a37269e3b7cf8bb80b0