OSDN Git Service

am 4c60b305: (-s ours) am 70a89584: Merge 742968bd
authorJean-Baptiste Queru <jbq@google.com>
Thu, 16 Jun 2011 21:14:24 +0000 (14:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jun 2011 21:14:24 +0000 (14:14 -0700)
commit6159baead8bc12ddaa0a9cb0d4885c7ce8e5155f
tree5c58effcb7fcfdef39445897f68d630d6245897f
parent73d2d1ff21f638eec634ea5a37f98c964b371467
parent4c60b30542a674d6375d2cccbe90161b34e62e5a
am 4c60b305: (-s ours) am 70a89584: Merge 742968bd

* commit '4c60b30542a674d6375d2cccbe90161b34e62e5a':
  Adding a cleanspec to pick up version change. Do not merge.