OSDN Git Service

am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples...
authorAlex Sakhartchouk <alexst@google.com>
Wed, 9 Feb 2011 23:23:54 +0000 (15:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Feb 2011 23:23:54 +0000 (15:23 -0800)
commit31e6d2e0d3fcc804fe61f6008f092db1301cf72b
treeea8394774dd2af9d10699c0198d5639d47f212a6
parent257497d912d90417680e38f210f090a7b1477fd7
parent65bcbcc8311b9a5f9909df16d212daaac3d09a5c
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb

* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples