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

am: d887102049

Change-Id: I566cc4b5a8a9b41c3298492ae547e90d764257ac
This commit is contained in:
Charles He 2016-12-15 17:47:43 +00:00 committed by android-build-merger
commit 551a396b15

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