tree 12b7e9bc38e20f545f1f3ffab0435c4288e232b2
parent f71632ea56024b0a7750ea42fbc4e2222d5eeeef
parent 04453f6a12c441447933595f2f18168e89660bca
author Oluwatobi Bashir-Bello <nbashirbello@google.com> 1408127662 +0000
committer android-build-merger <android-build-merger@google.com> 1408127662 +0000

Merge "Add a feature to import a specified settings jar." into idea133
automerge: 04453f6

* commit '04453f6a12c441447933595f2f18168e89660bca':
  Add a feature to import a specified settings jar.