tree b58b16538eae15982b5ed9f4daab7b4c60617b7d
parent c68299129dbdbbb992df14c31d97aafb50e08a7d
parent ad690bb85a62d0ceccfa2001563704c70d20617f
author Phil Dubach <nobody@android.com> 1241824863 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241824863 -0700

am ad690bb: AI 148634: CTS: Exclude AlarmManager test broken by CL148448

Merge commit 'ad690bb85a62d0ceccfa2001563704c70d20617f' into donut

* commit 'ad690bb85a62d0ceccfa2001563704c70d20617f':
  AI 148634: CTS: Exclude AlarmManager test broken by CL148448