branch test

Change-Id: Id3419cea44ac1d3ac2b2c0c6e9d69da2b3806907
AND simple

Change-Id: I1fd8f6bdcc8cb839a9618e30a946986d70603bdd
& simple

Change-Id: I0a28753c34a34ba7d0837cacd0173724f2452382
conflict fixed

Change-Id: If2cfe6122bf97215a1291d9409f15f1610a50ec5
remove .

Change-Id: I97e83f691c065de23eb64ededc39cc505f74df39
merge with no-ff
new

Change-Id: I96bc232d2f3efcaea6817612751554efbd491ead
add

Change-Id: I0993f7ba65a6a03bb1a8c787c94aea5233524573
rm new.txt

Change-Id: I7fa87b9b8b7e7d2b44e9610710e006e67838cabc
add new again

Change-Id: I6dc36719488fe1471324860df5ff17fde61f9a36
rm

Change-Id: Ieed1595af8f2c81f659c3235fc65461c1df9e6b3