am 2d58f735: am dd35a305: (-s ours) am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files"

* commit '2d58f735cca9f1a61dfa985f27afe960a51cb0b9':