tree 9f0222af65eb39e5c99dfd114a1d262e6cb370d1
parent 6ed7c1f06206039a4e581597ff0e4055e2ad56e1
author Jake Whatley <jacob.whatley91@gmail.com> 1473870952 +0200
committer Jake Whatley <jacob.whatley91@gmail.com> 1473870952 +0200

aosp-merge.sh: update branch name to android-7.0-merge

Change-Id: I57aaca9edd63b240191f8eb85469a44012e4b49d