tree f5f4f6cf9e96238c3e07199817ae357fce425a3a
parent 6061eb8733f1d1cb65c4d97a7c4736e4ebbc2a19
parent 72c384e0a16504638927fea2da36a4731953c8df
author Kristian Monsen <kristianm@google.com> 1288216570 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288216570 -0700

Merge "Fix for simulator build"