| commit | 6a784c88ebf375f80842336833dd7201b6938f12 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Wed Nov 30 03:27:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 30 03:27:47 2016 +0000 |
| tree | 00081112a9bca9e9ecbe29cf46530819cb9ce079 | |
| parent | 8ff379c9a38d389b8de643d46ca88b722ce57f9e [diff] | |
| parent | b11b2b01b5c981f18ad616a07542b090f8d3745c [diff] |
resolve merge conflicts of 34543c0 to nyc-mr1-dev-plus-aosp am: 524afcec4a Change-Id: I80326f8588a36674d0016df12e4f5f5f70c999a3