aboutsummaryrefslogtreecommitdiffstats
path: root/heimdall/source/Android.mk
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-08-14 10:01:22 -0700
committerKoushik Dutta <koushd@gmail.com>2013-08-14 10:01:22 -0700
commit49a02b8c916e8ef011d9f56901d208eca626b85b (patch)
tree1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall/source/Android.mk
parentc82df274ecea32cd6528f070a21528bf80a2f466 (diff)
parentf95619028fa5c80284e6ade2ced7772e41040424 (diff)
downloadexternal_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip
external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz
external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts: Linux/README OSX/README.txt heimdall-frontend/doc-pak/README heimdall/doc-pak/README Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall/source/Android.mk')
0 files changed, 0 insertions, 0 deletions