commit 910957804641cb28400bc069dc0148c2a2edba27
author mariagpuyol <mariagpuyol@google.com> Thu Mar 24 17:52:28 2016 -0700
committer mariagpuyol <mariagpuyol@google.com> Thu Mar 24 18:24:51 2016 -0700
tree cba81da4951cc714036dc36a86c93df76fbba3f9
parent 77aaf38530e47a6e920940a048df153b1d5c5b2d

Change v7 support toolbar to Toolbar

With this change we now extend activity instead of
ActionBarActivity (which extends AppCompatActivity, etc.). This is necessary to use ActivityInstrumentationTestCase2 in tests
Bug:27843836
Change-Id: I1834366744f04d56706a9db4814fb79199c07b26

Android.mk

diff --git a/Android.mk b/Android.mk
index 495dca2..9259ff3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,3 +53,5 @@
 LOCAL_PRIVILEGED_MODULE := true
 
 include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))