diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /recovery/Android.mk | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'recovery/Android.mk')
| -rw-r--r-- | recovery/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery/Android.mk b/recovery/Android.mk index 874985a..72cd80e 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -1,4 +1,4 @@ -ifneq (,$(findstring $(TARGET_DEVICE),tuna toro torospr maguro toroplus)) +ifneq (,$(findstring $(TARGET_DEVICE),tuna toro toroplus maguro)) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) |