tree 22c670699af8637658e9f2acac18e039dce46c7d
parent 34cbced96ea698ab3a7e9cfc5e8e857ecf9a9897
parent a454d328bc40a67b01d8d9d7839398332d9f5c85
author Jean-Baptiste Queru <jbq@google.com> 1271786339 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271786339 -0700

Merge "Replace AlarmClock with DeskClock in the SDK" into kraken