Merge commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20' * commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20': Debugging for issue #2228381 android.view.InflateException
Merge commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20' * commit 'e71db6579c2afe06fe95dd88217a667d18fe4e20': Debugging for issue #2228381 android.view.InflateException