OSDN Git Service

am e6a8cabb: am 565c5663: am 44dcf29d: Add include guards to avoid multiple definitions.
authorCarl Shapiro <cshapiro@google.com>
Tue, 12 Oct 2010 23:45:22 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Oct 2010 23:45:22 +0000 (16:45 -0700)
commitc5a6b178832ec7c29d8bc5a169ab7de9ca78d8c9
tree4c234d05a882086a635dcb073c12856cde6852fc
parent7f22bddf241aaeac187cc0c3ebba43478f16e2d1
parente6a8cabbd6bf5869fd302d9cd53212611f2c671b
am e6a8cabb: am 565c5663: am 44dcf29d: Add include guards to avoid multiple definitions.

Merge commit 'e6a8cabbd6bf5869fd302d9cd53212611f2c671b' into dalvik-dev

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