| commit | eaba5765ccafda7d4d963b0248c14648ccf9cfa6 | [log] [tgz] |
|---|---|---|
| author | SzuWei Lin <szuweilin@google.com> | Fri Sep 29 10:07:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 29 10:07:57 2017 +0000 |
| tree | a7fafffd2f998e944e2d28341259a3c91da7a6ae | |
| parent | 2cbb80d5b41ce5260ed1b09ed2172e7e8a18b6cf [diff] | |
| parent | 0ab6b24e07be374f3e700fb272a9e93652ce0d94 [diff] |
resolve merge conflicts of 40ef25d7bd to stage-aosp-master am: 0ab6b24e07 Change-Id: Ie811ebe6b5af696681cd8522d83280ef414eaef2