| commit | 28eec81d75da335236edaf535c14e8cb81da62f6 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Tue May 30 23:34:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 30 23:34:13 2017 +0000 |
| tree | 230539813f09258550f5cc7862e0199f9ed1d868 | |
| parent | 6d7e9d359282798d1356cb9310339bc459a088d6 [diff] | |
| parent | f7abe1bf9b48c9e1c31b8ca01d65e10624b089e0 [diff] |
Merge "resolve merge conflicts of fc5c78e0ef79 to oc-dev-plus-aosp" into oc-dev-plus-aosp am: f7abe1bf9b -s ours Change-Id: Icd2b19951af3e506692313b9dbf4a05429ce589c