| commit | 19e838ba3944f0a18c21fb396cfaf6c9f6db2c7b | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Wed May 04 11:43:31 2016 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Wed May 04 11:43:31 2016 -0700 |
| tree | e95a6eb4098b2c7001c04c9f8112ce6337605c24 | |
| parent | 5e6b0dd52422134fe46f6e80ca479607368402c5 [diff] | |
| parent | 0b546c408686e4353dfe4b3a12be1048b966944d [diff] |
resolve merge conflicts of 0b546c4 to nyc-dev-plus-aosp Change-Id: I76408f38afc40816ae4cc7ef82d1250225d18032