| commit | 736c28320ebeb283dc716a159598a97bde257c7d | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:39:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 11:39:44 2017 +0000 |
| tree | 5675c0d123080a1ed3bcf556cebe8fbeabca1f8f | |
| parent | 9a3af552a011f92389abb0d99949c477f444cffb [diff] | |
| parent | 70f5571a9a950a2b98d07c99a6f8d60b50fe4afd [diff] |
resolve merge conflicts of 5ab03cb41 to oc-mr1-dev-plus-aosp am: 70f5571a9a Change-Id: Ia4177e72e36dddcc01f38547a15c4fbf06d70174