tree e87e72c1b72f5d9ffcc662f3c6c9af163b15c15a
parent b320e187c6eddc4a9d5f31d397f52500d38b4c05
parent 272554233f7a9002727fdd27344e641b8d7575f6
author Vinit Deshpande <vinitd@google.com> 1429310421 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429310423 +0000

Merge "Remove strings left over from a conservative merge"