| commit | 8c7734f66409ff606c12349be99d7057d4742853 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Wed Aug 09 20:29:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 09 20:29:04 2017 +0000 |
| tree | cebcdd8fae2438e28102c85369cd92c37c0e5085 | |
| parent | 9165ecff77b8c94d5cca0e42c487ae58b524b862 [diff] | |
| parent | e48ca2099a79e3e27a237fc02294a2aa2e8e8305 [diff] |
Merge "resolve merge conflicts of 15658662fdde to stage-aosp-master am: 3b38eaa3c2 am: 208a84ecb9" into oc-dr1-dev-plus-aosp am: e48ca2099a Change-Id: Ia0d6e190d11061687649183979430d6fec375f2d