tree 2f116cdc609c6ad3e07100aab6407434e2e5ba78
parent 09b06e937a4d07074fdbba728ebd2f2235419110
parent bb593755d2fa8980855072dfdc72aae3adb2e6dd
author Android (Google) Code Review <android-gerrit@google.com> 1243928180 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243928180 -0700

am bb593755: Merge change 2865 into donut

Merge commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd'

* commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd':
  Fixes #1890155.