tree 9e338f2b1af07e517d5555b520c2ea3d33380d18
parent 62d36e3f5d31dfa94c499a0b8b4e72edbbf2ae62
parent e670e2f859dd436c43979453dd33c915075cfa4b
author Tom Cherry <tomcherry@google.com> 1449187075 +0000
committer android-build-merger <android-build-merger@google.com> 1449187075 +0000

Merge "Remove c++14\'isms from system_properties" am: b35a2fb370
am: e670e2f859

* commit 'e670e2f859dd436c43979453dd33c915075cfa4b':
  Remove c++14'isms from system_properties