tree b396778b922c2649407dbef3f0e2fb681a67b1a9
parent 64947314b74cc280928628614a4434c0b5c5dfb6
parent 8056ee21f033a7eba817656b82e1c337b59d0147
author Jean-Baptiste Queru <jbq@google.com> 1276296315 -0700
committer Android Code Review <code-review@android.com> 1276296315 -0700

Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"