| commit | 7a81a556c6bfb8e1453512fa898915acf0a460bc | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 04 13:46:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 04 13:46:28 2017 +0000 |
| tree | e8d3e99332e8fce51d3ca60d69975578ddd3e17d | |
| parent | 133de5995146ae2bac8e41dcad1573d017fd37d3 [diff] | |
| parent | 2916ab9bcb188b51f7fecdfb0770213b45afd3c8 [diff] |
Merge "resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: e251b587b7 Change-Id: Ibe96e349769405095fb2af1befa038bdf2e252b7