commit | f8c33703374f7805d3cd50ce06abd3c4fce8244a | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Wed Sep 27 15:08:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 27 15:08:50 2017 +0000 |
tree | 3d2386825222f4d129c031e1cf366cc636e865b1 | |
parent | 3c5bf8516a5869e77bf2a6b2e213249452f99b38 [diff] | |
parent | 99ef87acbfe42d6a29b35a8072cb9aed1b2a7742 [diff] |
Merge changes I6620c996,I094c2cb0 into oc-mr1-dev am: 27e56723de -s ours Change-Id: I9f18136d725664b8b732e0f4eb5d83822fda350c