tree ad74bd5df3aec76247dd06f985fc240adb2feb62
parent b7f24f5f875c71c896907b87435cfd04b4c7e529
parent 07f0912fe6bd5d4971ceb497e9b921ce20e6d9db
author Elliott Hughes <enh@google.com> 1461166089 +0000
committer android-build-merger <android-build-merger@google.com> 1461166089 +0000

Merge "Merge "Remove trailing punctuation from recovery strings." into nyc-dev am: 4eec72d am: 0e52921" into nyc-mr1-dev-plus-aosp
am: 07f0912

* commit '07f0912fe6bd5d4971ceb497e9b921ce20e6d9db':

Change-Id: I5560b9d38eff7995047d08a9d81736148710eebe