OSDN Git Service

am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
authorMike Lockwood <lockwood@android.com>
Mon, 17 Aug 2009 17:59:02 +0000 (10:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2009 17:59:02 +0000 (10:59 -0700)
commiteb6ed4b4fd8d6d4acf8269a673f002f1b59f86ba
tree526feee0f9d007ca05f9ac1f6568e9a5458fe345
parent621d0beb967facef8b47f9210a9ff61c90b64af8
parent06952d9299c23ee15df0825e75934971cfecf2ba
am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:

Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'

* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
  DO NOT MERGE - cherry-picked from master: