| commit | 30b71b10302bdfcd6c0679c03cf21d17a715317b | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Mon Jun 13 17:56:45 2016 -0700 |
| committer | Craig Donner <cdonner@google.com> | Mon Jun 13 17:56:45 2016 -0700 |
| tree | 883d9b303279bb72f2c47c002ff6dd15c8d44cfa | |
| parent | 30f77870174d305fef2bff378cca1a1536c75268 [diff] | |
| parent | 4931fb298e076212981b2acae6752743d7340f02 [diff] |
resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp Change-Id: I5c46d161af4c4d6b6fcec6705f2d9c7dccc41fc2