| commit | 7559e6683c64f10325cbffba01ed0a01e85cf54d | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 24 13:38:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 24 13:38:45 2017 +0000 |
| tree | 00077a255c800e5b7b2b08f1ed68d7573a716269 | |
| parent | 1fdf6034df66cbfcb8faafc7c7bf659fc7a16f40 [diff] | |
| parent | 2b99571564c445e0b36f39296af65252b6c7390b [diff] |
Merge "Sleep activities with AOD" into oc-mr1-dev am: f1ef6ef742 am: 2b99571564 Change-Id: Iae4b6dd49ba82cff1ba17b0d1265a085e1ad459e