tree 7f5ac6e29bfbeca636eb1fdcea91ac53ddfc36da
parent 8467544d4c8b4d23f1048775c145b087b73f2acf
parent 0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99
author Brett Chabot <brettchabot@android.com> 1276624149 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276624149 -0700

am 0e968fa2: Merge "Workaround for package-private framework tests in runtest." into gingerbread

Merge commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99' into gingerbread-plus-aosp

* commit '0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99':
  Workaround for package-private framework tests in runtest.