| commit | 3a4b29a897a1a70bdc809f9db52c6ea141bde8a8 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Mar 29 09:48:32 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 29 09:48:32 2018 +0000 |
| tree | 0d967d525a0a7a4a60a2668239ed53afd1b9c45b | |
| parent | 6473053db12e0485e59eb2c2d2e39bede11253c0 [diff] | |
| parent | 4a93e2f20965cac9f60c18602b659443ac632f88 [diff] |
Merge "Merge "Update to lock task features API" into pi-dev am: 3a5dabbb10" into pi-dev-plus-aosp am: 4a93e2f209 Change-Id: I76e34c49b4e8376d6c742b65c05e7c5f71f6bd58