Merge "[nit] Fix typo in properties.h" am: ded663c231

am: 21181e5297

Change-Id: I5625fb263d54f107a5b630037811c4d0d701ba86
This commit is contained in:
Charles He 2016-12-15 17:39:43 +00:00 committed by android-build-merger
commit d887102049

View file

@ -61,4 +61,4 @@ bool SetProperty(const std::string& key, const std::string& value);
} // namespace base
} // namespace android
#endif // ANDROID_BASE_MEMORY_H
#endif // ANDROID_BASE_PROPERTIES_H