OSDN Git Service

am 1a2d40c0: (-s ours) am b715a7c4: Do not merge: Cherry-pick change I21555e92 from...
authorDerek Sollenberger <djsollen@google.com>
Thu, 3 Mar 2011 06:27:27 +0000 (22:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Mar 2011 06:27:27 +0000 (22:27 -0800)
* commit '1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5':
  Do not merge: Cherry-pick change I21555e92 from master


Trivial merge