Merge "use master for all branches"
tree: 854d2f7e83bb3a93925b8c4fa402c6c21bd83f17
  1. default.xml
  2. m1.xml