| commit | 6c9f2593166fa84a9c24628b8339e30fe52edb15 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:32:17 2017 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Wed Nov 01 11:32:17 2017 +0000 |
| tree | 27211f9a8c61291c0f9f8d3b0aaf2014a0ed008f | |
| parent | 44cb042b53948ef7c2dc0b4195fc1e649b81b1d6 [diff] | |
| parent | 8b45697439a36406d3555e2590657be1b3f9ce20 [diff] |
resolve merge conflicts of 5ab03cb41 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic749614fb03d60d6cc7e0eb04bb67102e572e9f2