commit | c8e3f1ee193cb7fad3b553eb7566143bc68e7166 | [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 | ea3c0c78af51cfd0c99e7d1818390dd6e2fada7b | |
parent | 31d42c12bbd338c37306dd92ad0445c7d5941374 [diff] | |
parent | c0f54e34874271f540d904e60ef000cefd4fb785 [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