tree 14e4c5934ae618822c1e75f12fa2febaf6242aa1
parent 90a1e093775bf0b5f1abb33aeda94c2e91b634ac
parent 9f667c6ea054f7991fcd4e8a3ea884318b4dbaa2
author Joe Baker-Malone <jbakermalone@google.com> 1428344837 +0000
committer android-build-merger <android-build-merger@google.com> 1428344837 +0000

Merge "Adopting refactoring from 145321" into studio-1.3-dev
automerge: 9f667c6

* commit '9f667c6ea054f7991fcd4e8a3ea884318b4dbaa2':
  Adopting refactoring from 145321