| commit | 4a809e727ce1cbb5c3b1405ac1c40c08c119b9f5 | [log] [tgz] |
|---|---|---|
| author | Charles He <qiurui@google.com> | Thu Dec 15 17:55:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 15 17:55:47 2016 +0000 |
| tree | 2235db8f37e12595d5d1d0313f4427ca4335b6b3 | |
| parent | 2ae4bc1eac864d81408ee55712edeaf780f23705 [diff] | |
| parent | aa130b7ef8d169c8f82e216c02eca7b8d96ecd43 [diff] |
Merge "[nit] Fix typo in properties.h" am: ded663c231 am: 21181e5297 am: d887102049 am: 551a396b15 Change-Id: I9b750104ab4615c5a3ea16c822d98e54dcd6bb14
diff --git a/base/include/android-base/properties.h b/base/include/android-base/properties.h index 95d1b6a..4d7082a 100644 --- a/base/include/android-base/properties.h +++ b/base/include/android-base/properties.h
@@ -61,4 +61,4 @@ } // namespace base } // namespace android -#endif // ANDROID_BASE_MEMORY_H +#endif // ANDROID_BASE_PROPERTIES_H