tree 0422f3db33932997a0727e7a532e7fc7852a9de3
parent 61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4
parent c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5
author Brian Muramatsu <btmura@android.com> 1285630551 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285630551 -0700

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

Merge commit 'c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5' into gingerbread-plus-aosp

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