diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:13:45 -0800 |
| commit | 0a521f6d93206567c14bbacdc13819bf4baf82d3 (patch) | |
| tree | 2e11b47c9856368387b394b6831726f2526bf6dd /apps/Development | |
| parent | 171957c0bdc547ae6013daddffc03c8ec3ac2e3e (diff) | |
| parent | adce814038b96c87ea66fc1e5bfd85ab28d80590 (diff) | |
| download | android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.gz android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.tar.bz2 android_development-0a521f6d93206567c14bbacdc13819bf4baf82d3.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/development into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
Diffstat (limited to 'apps/Development')
| -rw-r--r-- | apps/Development/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk index 99133e85f..9dd2e1a34 100644 --- a/apps/Development/Android.mk +++ b/apps/Development/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common org.apache.http.legacy |