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)
commite6a8cabbd6bf5869fd302d9cd53212611f2c671b
treeb035a2b5694abe75bb573f586d233dd92a228a1e
parent643b045edcec8fe5b2b9b6f2f95529214f9d0dd2
parent565c56636641b9ed28ed479b6f4730e1a9df4f7e
am 565c5663: am 44dcf29d: Add include guards to avoid multiple definitions.

Merge commit '565c56636641b9ed28ed479b6f4730e1a9df4f7e'

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