summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-11-04 10:43:28 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-04 10:58:59 -0800
commit8331d3e508498a19c296fed41b9d4b23ea960031 (patch)
treeab450acfb4e38ffdba3ae893a83a052cc0041783 /Android.mk
parentb956432599de00a5edfeccc56615cb03c229c4e9 (diff)
parent64a04eb003d2af5bbc84db3062ee4d6a4194c513 (diff)
downloadframeworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.zip
frameworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.tar.gz
frameworks_base-8331d3e508498a19c296fed41b9d4b23ea960031.tar.bz2
Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/base into cm-13.0
Change-Id: I261957864b149edb709e6f76ed382043f9a96936
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions