John Spurlock 96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 ...

automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".

2014-11-05 15:42:30 +00:00

..

assets

…

res

Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9

2014-11-05 15:42:30 +00:00

Android.mk

…

AndroidManifest.xml

Split Telecom PhoneAccount registration permissions.

2014-10-31 14:44:30 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…