tree df60e95475a14fd550370dc80156ca99dbaa780c
parent 4fccd9723f87b247a85bb48c0247b68ad8924b41
parent 125808b9238036fdc1e69dbf06e82b78f6b6109e
author Dan Albert <danalbert@google.com> 1485893265 +0000
committer android-build-merger <android-build-merger@google.com> 1485893265 +0000

Merge "Purge the android_alarm headers." am: 6d298ffd80
am: 125808b923

Change-Id: Iecec4379dd16ef1e74442ff5646e784a18eb6616