| commit | aef042cfee42bdd0d209f96b6f2b665d8d3671a8 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Tue Nov 01 11:25:31 2016 -0700 |
| committer | Prashant Malani <pmalani@google.com> | Tue Nov 01 11:34:32 2016 -0700 |
| tree | dbaf8fd6d4cc2973aef482065ded0df0b09935be | |
| parent | 68207fd92e6adedd8631faffb962df6d4edfe7ab [diff] | |
| parent | 863442bba27258a2fc7228c66a1af782153f1250 [diff] |
resolve merge conflicts of 863442b to nyc-mr2-dev-plus-aosp Change-Id: If8787efbbf81d5e86625b2f4e771f6720c99c4c1