| commit | 36880fc711e004269266fae936ced1f970419cd4 | [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 | 726dc2b5d1b51473e78009157755886e02c261e3 [diff] | |
| parent | 89d520a550fcad41af2a92f12805015029d8ca5a [diff] |
resolve merge conflicts of 863442b to nyc-mr2-dev-plus-aosp Change-Id: If8787efbbf81d5e86625b2f4e771f6720c99c4c1