commit | 7e8fdf0b8327f21f70661bbe84be07d7a4869b48 | [log] [tgz] |
---|---|---|
author | Alex Sakhartchouk <alexst@google.com> | Wed Feb 09 15:27:34 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 09 15:27:34 2011 -0800 |
tree | 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d | |
parent | 2d4457306436fb67d9b2003658ae1026895453bd [diff] | |
parent | 31e6d2e0d3fcc804fe61f6008f092db1301cf72b [diff] |
am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb * commit '85bccf6e0b555bc5245628ba7340123b6b367b51': DO NOT MERGE Removing an activity that shouldn't go into samples