diff options
| author | Ying Wang <wangying@google.com> | 2013-04-05 18:59:43 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-04-05 18:59:43 -0700 |
| commit | ca9c13a51da963a6a1d399e774d32da491368519 (patch) | |
| tree | fc0fcda09341f155cf6a12e78b28fca00b2a7f5d | |
| parent | beeadda28642792e0c6e79fd842c891882ec9c9b (diff) | |
| parent | 5656a481dd848a31bbd53c50773bfc9f3ee323ea (diff) | |
| download | bison-ca9c13a51da963a6a1d399e774d32da491368519.tar.gz | |
resolved conflicts for merge of 5656a481 to jb-mr2-dev-plus-aosp
Change-Id: I9d8dfaf94cd66233c4ae99d73c85152517885965
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |