commit | 365b215832cee27c90a00f5e8ffd1795ea176bf9 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@google.com> | Wed May 28 09:16:33 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 09:16:33 2014 +0000 |
tree | f3e493daa18566597f49fb00132aa4624608cca6 | |
parent | d9f10994188aa5f3a48165538e73cf8eb901e71b [diff] | |
parent | f86626ca295e423425a0d2e3688795ebf87e18df [diff] |
am f86626ca: am 12d71b66: Merge "resolve merge conflicts of 838c441 to master." * commit 'f86626ca295e423425a0d2e3688795ebf87e18df': package-release.sh: script breaks if commit msg contains single quote(') package-release.sh: Merge master version.