| commit | e0d016a4c9c040add01af9c9ac642bfee5e1b6e2 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Sep 09 19:05:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 19:05:07 2016 +0000 |
| tree | ac314d4f2d0983210d8cc10fbc49cb1ca5604eef | |
| parent | af9f6d3956672ac552e2404e2252f1aa9fc784a6 [diff] | |
| parent | 5886ad539846bf10fd15069915ded5d805f31e45 [diff] |
Merge "resolve merge conflicts of 35514a3 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp am: 5886ad5398 Change-Id: Ifd7cd30d67e086bfb785add7205bf8389e7f12b8