tree de99515643bacdb46fc88bd647dc284caf602c19
parent 1d3b763922cfa97a2184f93bef97b157c49df331
parent 78c958113985f64866c94daba3f1cbe430cdfb8c
author Dmitriy Ivanov <dimitry@google.com> 1418168334 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418168334 +0000

am 78c95811: Merge "Remove checks for TARGET_SIMULATOR"

* commit '78c958113985f64866c94daba3f1cbe430cdfb8c':
  Remove checks for TARGET_SIMULATOR