| commit | e7b81736b0e4a63cced37ecc7e157fd2475d80fe | [log] [tgz] |
|---|---|---|
| author | Ying Wang <[email protected]> | Fri Apr 05 21:08:40 2013 -0700 |
| committer | Ying Wang <[email protected]> | Fri Apr 05 21:09:38 2013 -0700 |
| tree | fc0fcda09341f155cf6a12e78b28fca00b2a7f5d | |
| parent | ca9c13a51da963a6a1d399e774d32da491368519 [diff] | |
| parent | a48f77b5badf04bfcb9f9fe4839efda4f83309a2 [diff] |
resolved conflicts for merge of a48f77b5 to jb-mr2-dev-plus-aosp Change-Id: I6f978c9bd94fbe23a3789b2ae81ab7d86b3c2d71
diff --git a/Android.mk b/Android.mk index dc83178..d4187b9 100644 --- a/Android.mk +++ b/Android.mk
@@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := $(call my-dir) +LOCAL_PATH:= $(call my-dir) ########################################### include $(CLEAR_VARS)