tree 171eadda1b903980d9040c248ba62d0392a9dba5
parent 0974b9449f9d995b6f3f6db9a28d976d3059d947
parent 8b0c666c50055389c0e24efb582b3317266733c8
author Android (Google) Code Review <android-gerrit@google.com> 1243629923 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243629923 -0700

am d1353cc4: Merge change 2731 into donut

Merge commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465'

* commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465':
  Fixes #1873537.