commit | 565c56636641b9ed28ed479b6f4730e1a9df4f7e | [log] [tgz] |
---|---|---|
author | Carl Shapiro <cshapiro@google.com> | Mon Oct 11 15:17:47 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 15:17:47 2010 -0700 |
tree | 2800c527306be5a1246469225e377829ef0b3973 | |
parent | 65da91cf96f8e567db9fc1221d2dcb12bad2ab80 [diff] | |
parent | 44dcf29d18f819b4b9d78d4d81676681b57f44ce [diff] |
am 44dcf29d: Add include guards to avoid multiple definitions. Merge commit '44dcf29d18f819b4b9d78d4d81676681b57f44ce' into gingerbread-plus-aosp * commit '44dcf29d18f819b4b9d78d4d81676681b57f44ce': Add include guards to avoid multiple definitions.