Merge \"logcat: help spelling correction\"
am: 20a172fca7

Change-Id: I2fd638e43b9d4f677d55a9c7b2e7c8eebfce5b0a