Merge commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df' * commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df': Finish fixing issue #2228381: android.view.InflateException...
Merge commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df' * commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df': Finish fixing issue #2228381: android.view.InflateException...