| commit | 7b034eb0a10562085a39249dbf4be6cbafe3ac43 | [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 | 7b736efe13056a96dac2939985ad2110c5fc9569 [diff] | |
| parent | 27e56723de8819898a09f4d16b743f76136f3497 [diff] |
Merge changes I6620c996,I094c2cb0 into oc-mr1-dev am: 27e56723de -s ours Change-Id: I9f18136d725664b8b732e0f4eb5d83822fda350c