| commit | 619875061d3439e886811dc41d91781b1f581f52 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 11 13:59:03 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jul 11 13:59:03 2016 -0700 |
| tree | 4c09bec90d8a807064fd476b7504a3adc795e8a8 | |
| parent | f2ffdac47a96ccc1da855590f978bfe29cfabaa5 [diff] | |
| parent | 743b0c5e357023f38672149bc6d7820819f081f6 [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master Change-Id: I17c32128b1c376927319183fa78eb60044a7d0b5