| commit | b11b2b01b5c981f18ad616a07542b090f8d3745c | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Nov 29 15:24:06 2016 -0800 |
| committer | Tom Cherry <tomcherry@google.com> | Tue Nov 29 17:17:26 2016 -0800 |
| tree | 46b3344c2862e7222b5751cae93f905768490768 | |
| parent | e6b5df5add5d76675d0bb0934c30827be5b0de30 [diff] | |
| parent | dc259e4bd66b4ce557c964105e8541e4a4bfc1ca [diff] |
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp Change-Id: I20f24693f201f1a15ded1fd6dfb6d56a58ebcaa8