tree c4bdc6933f9481e51cf7ac977d787d3e74418866
parent ab072976dabe3ccda007d17cf41f7664d6c4f609
parent d4b98a41ea35983ee4b7b10f50a35718f505e370
author Jordan Liu <jminjie@google.com> 1502140168 +0000
committer android-build-merger <android-build-merger@google.com> 1502140168 +0000

Merge "Fix crash issue when user uses multi-window mode on VoicemailSettings" am: 1ed70c32f4
am: d4b98a41ea

Change-Id: Ibbf628df95ae59a24905df9f3e2a8e9d64d78494