| commit | 857983c3b89955785fa69919304f8e713b57c524 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Jan 11 15:38:00 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Wed Jan 11 23:42:46 2017 +0000 |
| tree | 06d8f01312ac2f1d6ed32dc0dacaad3623894cdb | |
| parent | b76da2bd061e8ce15f55bd21e7f9b5a1764d9ae5 [diff] | |
| parent | 20bd2d02c553c0081cbf5be8ca2c856eeca84ae9 [diff] |
resolve merge conflicts of 20bd2d02c5 to nyc-mr1-dev-plus-aosp Test: flashed build and manually tested on bullhead BUG: 34107289 Change-Id: Ic3b2cca420d9d86bce47c4464976c643a4df2505