| commit | 785b07ed1dc7fe8074b72a717c9d657962a00c3a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Dec 07 13:36:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 07 13:36:58 2016 +0000 |
| tree | 8466d2aaa6073e40f248e09cc2c2d5fa41f8d876 | |
| parent | 635821159fc12f29d25d7e5a80577bea22f509c3 [diff] | |
| parent | 2d9a305179c958b78482b9a12c9410020bc795da [diff] |
resolve merge conflicts of 48d4fe1 to nyc-mr1-dev-plus-aosp am: ee9c24d6e0 Change-Id: Iac0dd8e4335b81d43b8939f0a70474913ccc2584