OSDN Git Service

am 565c5663: am 44dcf29d: Add include guards to avoid multiple definitions.
authorCarl Shapiro <cshapiro@google.com>
Tue, 12 Oct 2010 23:27:10 +0000 (16:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Oct 2010 23:27:10 +0000 (16:27 -0700)
Merge commit '565c56636641b9ed28ed479b6f4730e1a9df4f7e'

* commit '565c56636641b9ed28ed479b6f4730e1a9df4f7e':
  Add include guards to avoid multiple definitions.


Trivial merge