| commit | 91132e9f6da482b4ed537696309405283c358555 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Mon Oct 17 17:01:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 17 17:01:48 2016 +0000 |
| tree | ff32b336414d397229f492f1976b1f968c4aa580 | |
| parent | b4f2c7ed1cc75e3f6b846dab5f98da4a52b2fd90 [diff] | |
| parent | ae7178e43a4ba8e8f2b9118f31b549a436705b4c [diff] |
resolve merge conflicts of 530cbe4 to nyc-mr1-dev-plus-aosp am: ae7178e43a Change-Id: I89a6424e29fd6ea73b77d7a6973ae70121efa749