| commit | 327f1778938a7cd798c013284c5a1404fa06aa88 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Oct 04 13:49:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 04 13:49:26 2017 +0000 |
| tree | b8a1bed59909734e4cbdee38185207902e9e51ad | |
| parent | 728254d273eeee64a2be186520d7d2cad65d1e03 [diff] | |
| parent | f0c38654b49aa5b044e793784bf5a4bfc213c530 [diff] |
Merge "resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: e251b587b7 am: f0c38654b4 Change-Id: I3e0c7a14ca6b33b933c68cd2deae104812e2c4fa