commit | f1ef6ef742b6ce219f5a9c51eca9aa400bd27a5d | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 24 13:19:42 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 24 13:19:42 2017 +0000 |
tree | 5b22b30b255748b80ac141a054411dc1fae623e5 | |
parent | 0d9c30cf88860334e4e67e10f0a1e82800fcee16 [diff] | |
parent | f12ec0fb6419920d3aa606141a91343cc9421275 [diff] |
Merge "Sleep activities with AOD" into oc-mr1-dev