| commit | 971c25b0a34b6c1c8798eae63a94bbc63cc6b71e | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Wed Nov 16 18:53:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 18:53:13 2016 +0000 |
| tree | c46ad7f08d1e76e8479f88bba537bfdaf3767645 | |
| parent | 91804d3eca1710063e82e5b65eea68db703eed74 [diff] | |
| parent | 29dedec71a47f721c7bcc28bdd3e1737e40f6f70 [diff] |
resolve merge conflicts of 70b9a03 to nyc-mr2-dev-plus-aosp am: 29dedec71a Change-Id: I466f01c11ccaf6fe84cbabf4de44bd7485946903