Merge "Fix null deref crash" into nyc-mr1-dev

am: fc9689e1ed

Change-Id: I613ee5b94999d50037954dff7bb4716f596fa8d6
This commit is contained in:
John Reck
2016-08-01 22:05:18 +00:00
committed by android-build-merger

Diff Content Not Available