| commit | b79e31756b979462294632f1a1e61ce52b833206 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Jun 23 19:48:40 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Thu Jun 23 19:48:40 2016 -0700 |
| tree | 3403cb9ea5457e594d3372d9407105eaadc3e4c3 | |
| parent | d35dcb9092f502561a72b1c55d3e028f59928cb2 [diff] | |
| parent | 2abbbd03339947327ada0becba5bd4ef41f1bdab [diff] |
resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp Change-Id: I2d06f0cec793185533ef2fc78428dfd99815030c