| commit | b143c9708cfe9b17d17e3864c93d6a9c5e5a0569 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon Aug 01 13:44:54 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Mon Aug 01 13:44:54 2016 -0700 |
| tree | 46bd455a229ddc7865d90e867fadc8aec80f1c28 | |
| parent | 56e22336c81ad304ba0dea470778ccc44fb947d1 [diff] | |
| parent | d072ed36344ea06b53d6e821ccf58aef16c3c260 [diff] |
resolve merge conflicts of d072ed3 to nyc-mr1-dev-plus-aosp Change-Id: Ifdd67548e252fcd73833a9d017aa8205bf749f70