| commit | 42d4fc502542fa8d7de345ec10dbb1c8cad00518 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Apr 29 10:59:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 10:59:53 2016 +0000 |
| tree | 3896d4d59c4fc8345a7d237ba2953b844d8b2a52 | |
| parent | 94df126c40b30d32d483534554f973528f3e4343 [diff] | |
| parent | e4e7fc501f2117a316b7abe4f5b5fac32a43325c [diff] |
Merge "Fix incorrect merge resolution" into lollipop-mr1-cts-dev am: e4e7fc501f * commit 'e4e7fc501f2117a316b7abe4f5b5fac32a43325c': Fix incorrect merge resolution Change-Id: Iaa6eb52e4626a19ecdb4ddcb0af755da65abac84