commit | 4eb997d52b05a005f82f4fee5f55fd3bec1bb2a9 | [log] [tgz] |
---|---|---|
author | Tianjie Xu <xunchang@google.com> | Thu Jan 19 16:18:31 2017 -0800 |
committer | Tianjie Xu <xunchang@google.com> | Thu Jan 19 16:18:31 2017 -0800 |
tree | 7280cc707ebf6b447cbd684b5c296bf58e4ddb20 | |
parent | a41cc29447af5667a237475ba483b7ebf6009cf7 [diff] |
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15