| commit | 14295772c3c055e4b9b25b8b8e9c39a2b78f9a18 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Mon Oct 10 16:11:41 2016 -0700 |
| committer | Hall Liu <hallliu@google.com> | Mon Oct 10 17:13:30 2016 -0700 |
| tree | bda6af87856cd11f827081a79795afe8c0d9dac7 | |
| parent | 84545eeaf5734fcb7e3867f6aea20c730b38c4a7 [diff] | |
| parent | 253b12905cd4253837aa8e769df93201697adf14 [diff] |
resolve merge conflicts of 253b129 to nyc-mr1-dev-plus-aosp Change-Id: I9d37a418982377eb1b94596998e22467d6c86402