| commit | 27cdfc3e9d7c71bd95639eb315fac2c36494e14e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Jan 18 15:39:44 2017 -0800 |
| committer | Josh Gao <jmgao@google.com> | Wed Jan 18 15:39:44 2017 -0800 |
| tree | a9113a9eb15b4918daebec6b4e0f7c7d622c2eee | |
| parent | 354b20fe5843444aad9e54ff60d9b73de24fb1e9 [diff] | |
| parent | f79a82d6a25a64430c5e72b06016190ab07a5f48 [diff] |
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9