[automerger skipped] Merge "Added bands from HAL 1.5" am: 91409817 am:...
[automerger skipped] Merge "Added bands from HAL 1.5" am: 91409817 am: 9ddd49a5 -s ours am: e4c3632d -s ours
am skip reason: Change-Id I77071b2edad98c632563d28827085cfcdcbed2f3 with SHA-1 a495776f is in history
Change-Id: I9cc7b76fa0af09a2ec4de1f92beccc335c0f62c7