tree 4fc8996f5e2eb50b96fa994a6b1eacd5082e2377
parent f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d
parent 181a9811e49ecd83593f2cd7963ac0127baa7d74
author Android (Google) Code Review <android-gerrit@google.com> 1246928882 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246928882 -0700

Merge change 6315

* changes:
  should fix sim build