commit | a8f2c292961c78c049dccf752f6705751a721e51 | [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 | 47b7473cb8027aea89ea0a21c00cc1ecdd67438c [diff] | |
parent | 7b034eb0a10562085a39249dbf4be6cbafe3ac43 [diff] |
Merge changes I6620c996,I094c2cb0 into oc-mr1-dev am: 27e56723de -s ours am: 7b034eb0a1 Change-Id: I14fa6165aae4be0e61b3ad3240c0f741412ebefa