tree d8c905e98ea19682efe06ab6a89995bc9296166b
parent 8911cdad26a41ab2b11be429ab4df3c7e04c8d46
parent 72b0ffe4c3776b33844bb00b9be5693bddd391f9
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