| commit | ddf293aa0cfe6ba9562ad12bc8555e6f389db53f | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Oct 14 15:51:00 2016 -0700 |
| committer | Tao Bao <tbao@google.com> | Fri Oct 14 15:51:00 2016 -0700 |
| tree | 53215d53951803908be2d4af5f7dc5274d313ad8 | |
| parent | 1b1a4edb4bc102706d6171901bb15f623adf2d2e [diff] | |
| parent | 08d0ae9254bee77b81d8d66512cf4b73f8ecaa8b [diff] |
resolve merge conflicts of 08d0ae9 to stage-aosp-master Change-Id: I4d0cc04fd5853cabdd950691dfb2e7115cb1ff17