tree ddc5aca3aaa9a9e29784ad2de455e87b49c8aa29
parent 0717235eb5a5b761f3549f1c2b8c94019b9d6220
parent 52c31d041432a42cc5e5649df6b01ca48843e94f
author Brian Muramatsu <btmura@android.com> 1285630316 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285630316 -0700

am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations

Merge commit '52c31d041432a42cc5e5649df6b01ca48843e94f' into gingerbread

* commit '52c31d041432a42cc5e5649df6b01ca48843e94f':
  DO NOT MERGE Cts Feature/Profile Annotations