| commit | c1ac95185c8b20be412d3cd436e8229d39efae08 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Sep 27 15:10:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 27 15:10:50 2017 +0000 |
| tree | 5735e19de6cead67c85a8ac3a65985d43b17e69f | |
| parent | 3c6ee5c27650dfa3c44616e2b49d56a81b75b093 [diff] | |
| parent | f8c33703374f7805d3cd50ce06abd3c4fce8244a [diff] |
Merge changes I6620c996,I094c2cb0 into oc-mr1-dev am: 27e56723de -s ours am: 7b034eb0a1 Change-Id: I14fa6165aae4be0e61b3ad3240c0f741412ebefa