| commit | b576a165fa6e8189d8aff4edb1fbb13a914c4bf5 | [log] [tgz] |
|---|---|---|
| author | Tomasz Wasilczyk <twasilczyk@google.com> | Fri Jun 09 15:46:17 2017 -0700 |
| committer | Tomasz Wasilczyk <twasilczyk@google.com> | Fri Jun 09 15:46:42 2017 -0700 |
| tree | e7e5fa8cea8fac79e62f95fb9c21ac527953447c | |
| parent | 3bb112c340cff034f83a9633baef80451a2e8531 [diff] | |
| parent | a9e037ed33ef2ede13ad536a212af01b1f5b9499 [diff] |
resolve merge conflicts of a9e037ed to oc-dev-plus-aosp Test: it builds on AOSP and master Change-Id: Ic48edc2081579656be43f92ab20ec7a9720595bf