tree 34413b864be0be643126826258030449e10f0b18
parent 7cd5339b1100ebcaf5bf05e44e0d0adeba4f261c
parent b4c4265f9e532fb18c2d7097b1b2dd82d90f6b99
author Android (Google) Code Review <android-gerrit@google.com> 1243112750 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243112750 -0700

Merge change 2359 into donut

* changes:
  Fix for the simultor build breakage.