tree f3e493daa18566597f49fb00132aa4624608cca6
parent 3e143cb2bbe0ff77a0052c0a60677b76d3e17d74
parent 12d71b66db40836a671f91c934be238c7d3e87b6
author David 'Digit' Turner <digit@google.com> 1401266695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401266695 +0000

am 12d71b66: Merge "resolve merge conflicts of 838c441 to master."

* commit '12d71b66db40836a671f91c934be238c7d3e87b6':
  package-release.sh: script breaks if commit msg contains single quote(')
  package-release.sh: Merge master version.