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

am: 551a396b15

Change-Id: I9b750104ab4615c5a3ea16c822d98e54dcd6bb14
This commit is contained in:
Charles He 2016-12-15 17:55:47 +00:00 committed by android-build-merger
commit 740bc012f2

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