OSDN Git Service

am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that...
authorAlex Sakhartchouk <alexst@google.com>
Wed, 9 Feb 2011 23:27:34 +0000 (15:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Feb 2011 23:27:34 +0000 (15:27 -0800)
commitea66e4c6f0edbae806b9aaf8c77df64eeaee0f96
tree59eba16c750f33da800b044e10d0e3af0bd8e533
parent0f81d19d82b71134065b2e0c6a923ffff5704244
parent85bccf6e0b555bc5245628ba7340123b6b367b51
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