tree ed07e0eb17617ab3f06aead59ef4218a1b0361ad
parent b22a4378c60316f33365f97947f61c9dde1cae5a
parent 4c6d7c268fbe353e517b399f13a7fa3c68e1ce9e
author Daniel Sandler <dsandler@android.com> 1281103610 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1281103610 -0700

Merge "Supply a description for the AlarmKlaxon service." into gingerbread