tree 5234ed5d7ec23ec9e239d0f31298bcd6a45c63e9
parent 7459ad0aec8991d029da6ee0151a830e88769b8d
parent 048b643bd8e51bc726d459f868dc8f5f9018e69b
author sung_jae <sung_jae.kim@samsung.com> 1566941929 -0700
committer android-build-merger <android-build-merger@google.com> 1566941929 -0700

Merge "Fix NPE" am: 78658058dc am: f66dc6a966 am: 085bce44f9 am: aef181528b
am: 048b643bd8

Change-Id: I63d44cbd21ee8635f40d3cc4d965c6e3dea0ad4d