commit | 31e6d2e0d3fcc804fe61f6008f092db1301cf72b | [log] [tgz] |
---|---|---|
author | Alex Sakhartchouk <alexst@google.com> | Wed Feb 09 15:23:54 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 09 15:23:54 2011 -0800 |
tree | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
parent | 257497d912d90417680e38f210f090a7b1477fd7 [diff] | |
parent | 65bcbcc8311b9a5f9909df16d212daaac3d09a5c [diff] |
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