| commit | ccd3468567c68f099609736bb7f8af637cbd1792 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Tue Oct 18 10:07:00 2016 -0700 |
| committer | Bryce Lee <brycelee@google.com> | Tue Oct 18 10:07:00 2016 -0700 |
| tree | 143bc8966fb5ec831fc3755289ccdbc9074d5e4a | |
| parent | b38b015b7c038a7e9bf609f31cf7ad1802e336d3 [diff] | |
| parent | b1301fa2849bafd6daa422281dc5200863bc761e [diff] |
resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe