| commit | 864052d53f3269e1fdb333f002c8d7d298c91eb2 | [log] [tgz] |
|---|---|---|
| author | Ta-wei Yen <[email protected]> | Wed Oct 12 11:06:45 2016 -0700 |
| committer | Ta-wei Yen <[email protected]> | Wed Oct 12 11:06:45 2016 -0700 |
| tree | 882227bdb737c61fd63219a0310f7ce553945840 | |
| parent | 0dfd64607be4fa956f38c1520c710977a1f3aa53 [diff] | |
| parent | 3d43d7f2c98fac2485eaaef39bc6cad3dd8c0d2c [diff] |
resolve merge conflicts of 3d43d7f to nyc-mr1-dev-plus-aosp Change-Id: I757c3b07e41c83ff7076009554d6f6cc84e4a7b1