OSDN Git Service

am b1931a01: (-s ours) DO NOT MERGE: Cherry-picked 5761e46f88aa2f216d8d22288435c49715...
authorEric Fischer <enf@google.com>
Fri, 28 Aug 2009 20:41:26 +0000 (13:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2009 20:41:26 +0000 (13:41 -0700)
Merge commit 'b1931a01a8f671c8470a1c70c5e121520e736cf8'

* commit 'b1931a01a8f671c8470a1c70c5e121520e736cf8':
  DO NOT MERGE: Cherry-picked 5761e46f88aa2f216d8d22288435c497153931c7 from master branch


Trivial merge