| commit | dcaad239102697510a180ee08be8468091c640f9 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Jul 28 16:25:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 16:25:54 2017 +0000 |
| tree | b9ad023cab57e3574bd7f9c46a85fb9c140fe81f | |
| parent | 02c5f0274f2910cb11d360cfa19464d8974507bb [diff] | |
| parent | 7f2953e9876cba25b2c0bab98320a38556d30150 [diff] |
Merge "resolve merge conflicts of 19d8e4e04e6c to oc-mr1-dev" into oc-mr1-dev am: 7f2953e987 Change-Id: Ifacc4798ea0148e6ac50682dafe304c2b404ce02