| commit | ba78c69a7ef90156e2ca4f8cb0debb1ea969f6f3 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Fri Nov 18 15:55:51 2016 -0800 |
| committer | Jin Qian <jinqian@google.com> | Fri Nov 18 15:55:51 2016 -0800 |
| tree | 812150693c952c742684e7a4362b9b82f2ee1354 | |
| parent | db47e7098ff5c999197779c061baa539cede2963 [diff] | |
| parent | de57ce938620a322bdf139e404ab061635767625 [diff] |
resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp Change-Id: I968f88ea425fb69a0395451fa290f1947e185859