tree 176e45fea1b54c1dcfb8bda536bad1aea285cf28
parent 6d3fa2751871fbcee06b6316016f9b07b89c49a0
parent 4cb8ae291ea00f0f0143818fe225be47444b8950
author Marco Nelissen <marcone@google.com> 1265928121 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265928121 -0800

Merge "Fix simulator build."