am 6be37f5f: Merge commit \'0a56e711\' into HEAD
The Android Open Source Project authored
* commit '6be37f5f':
eead725b