diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-03-19 23:49:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-19 23:49:49 +0000 |
| commit | 9de411f492782621e543424eaa07027e3104add8 (patch) | |
| tree | 2f36d45e45290564c35e27f3d86e72dea2c81982 /Android.mk | |
| parent | ddb36551bb48479c0217db56a6cb1666f3b07486 (diff) | |
| parent | 02329d7b2efce6ef5781bf95ecdd83f08fed8b08 (diff) | |
am 02329d7b: Merge "Always show WAIT/PAUSE in dialer overflow menu." into jb-mr2-dev
* commit '02329d7b2efce6ef5781bf95ecdd83f08fed8b08':
Always show WAIT/PAUSE in dialer overflow menu.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 97dfd82d5..ea13c65f8 100644 --- a/Android.mk +++ b/Android.mk @@ -34,5 +34,5 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -# Use the folloing include to make our test apk. +# Use the following include to make our test apk. include $(call all-makefiles-under,$(LOCAL_PATH)) |