| commit | 2db972962cae6cf4ec2784a288590665f112f7bb | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Fri Apr 17 22:40:21 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 17 22:40:23 2015 +0000 |
| tree | e87e72c1b72f5d9ffcc662f3c6c9af163b15c15a | |
| parent | b320e187c6eddc4a9d5f31d397f52500d38b4c05 [diff] | |
| parent | 272554233f7a9002727fdd27344e641b8d7575f6 [diff] |
Merge "Remove strings left over from a conservative merge"