am b336cb04: am e830df33: (-s ours) am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."

* commit 'b336cb0472ae2d48a19abb3ba153153c3ec7a1fa':