OSDN Git Service

am 1501492c: (-s ours) am f0f3e98f: DO NOT MERGE
authorNick Pelly <npelly@google.com>
Tue, 1 Feb 2011 21:27:08 +0000 (13:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Feb 2011 21:27:08 +0000 (13:27 -0800)
* commit '1501492cfb30aa6f2907661b6240acf8f7a260e1':
  DO NOT MERGE


Trivial merge