| commit | 8be87cd8869f68c7567a6c4b4022f5b2507813ba | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 04 15:31:13 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed May 04 15:31:13 2016 -0700 |
| tree | 7966dff07c12a184bca9eac7f168e1a95def75fd | |
| parent | 19e838ba3944f0a18c21fb396cfaf6c9f6db2c7b [diff] | |
| parent | 7a52b75766ebf32605860c51588f093fa5b0e4d3 [diff] |
resolve merge conflicts of 7a52b75 to nyc-dev-plus-aosp Change-Id: Ic895408a1ecd4ec0d15ae06ec81029e79b67bbd7