| commit | b3f764ead8122fb84cd05082d21fc9574e18ee28 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Mar 23 22:27:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:27:58 2015 +0000 |
| tree | 0878c1a70fed7dcb2c000b3bdfda417ca0dee293 | |
| parent | a624c60e622e80a1a9f4030f2d2421a9893f0c04 [diff] | |
| parent | 833c7ee68a562cae92c7f70fb572ec8747a09c00 [diff] |
am 833c7ee6: am a575b850: am 61af6530: Merge "Remove /dev/alarm cruft from uptime." * commit '833c7ee68a562cae92c7f70fb572ec8747a09c00': Remove /dev/alarm cruft from uptime.