am 5f1b3e37: am 596edaf3: Merge change 26156 into eclair

Merge commit '5f1b3e37f24b32f81d5792da1f620bc61e05a402'

* commit '5f1b3e37f24b32f81d5792da1f620bc61e05a402':
  keystore: exclude builds for simulator.

cmds/keystore/Android.mk

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+ifneq ($(TARGET_SIMULATOR),true)
+
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -30,3 +32,5 @@ LOCAL_SHARED_LIBRARIES := libcutils libcrypto
 LOCAL_MODULE:= keystore_cli
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_EXECUTABLE)
+
+endif