tree 297bb12fbf98117f4ce395db988bebc846243de0
parent 6b5c200025a21439eee388c27e34c9f2d25627f8
parent b4735b6c04c6bca3219115395748a1b5ef02ff6c
author Jorg Pleumann <nobody@android.com> 1242027869 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242027869 -0700

am b4735b6: am 25f9637: AI 148665: Disabling a test that does not work a

Merge commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c'

* commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c':
  AI 148665: Disabling a test that does not work as