| commit | 30b93e1b6c3744197989dce3cb4ae243ef6ca3e8 | [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 | 82a985a7fca1eb118226edd5333a69bc734448d0 [diff] | |
| parent | 903d93cb01eee7bcf8877caf53918d09ff2b8144 [diff] |
resolve merge conflicts of d072ed3 to nyc-mr1-dev-plus-aosp Change-Id: Ifdd67548e252fcd73833a9d017aa8205bf749f70