| commit | 0b58f198df6c3ce5df1d2061c54bd691ee32ac3a | [log] [tgz] |
|---|---|---|
| author | Robert Sesek <rsesek@google.com> | Mon Oct 10 18:34:42 2016 -0400 |
| committer | Robert Sesek <rsesek@google.com> | Mon Oct 10 18:34:42 2016 -0400 |
| tree | 5d3d29392fe12217f3585b35c5b35171888f4ba5 | |
| parent | 6fd39c5cd559540f457ccbe93a9b7c499d285680 [diff] | |
| parent | 8f8d187a78b48109911a800ba5993b645d3015c5 [diff] |
resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp Change-Id: I75c7110ee4f0c9717e7276b609caa2402ef5c2be