| commit | df956eceefb6bf7addc0057572741237cacdfa12 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Jun 03 21:26:19 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Fri Jun 03 21:26:19 2016 -0700 |
| tree | 7450e7b9628dc45c39337fe636f719e105d5dd27 | |
| parent | 3295d1993a1ddbfe17c5d5750f2ca975359662b2 [diff] | |
| parent | 1afa4d7b23ce8b9852cda1f495145f320414c3d4 [diff] |
resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp Change-Id: I8fca64ebdbafe27f02d359619aa60ab82618114a