tree caeac020149ff784bea22015b30232543a35c791
parent 9d35d0c4a1371d52c4ce4d34575967026d9135af
author Mike Lockwood <lockwood@android.com> 1310569617 -0400
committer Mike Lockwood <lockwood@android.com> 1310600744 -0400

Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build

Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>