tree 8000fb756cd3ece996fd986ce1b36ac2586f6f40
parent 1a4df05f2e7f07709a64095c4f3d5f9914fdcfc0
parent b1ead567326f331e0c03cd12f5c7155a57f49fff
author Jin Qian <jinqian@google.com> 1440717361 +0000
committer android-build-merger <android-build-merger@google.com> 1440717361 +0000

Merge "Upgrade 3.4 kernel images to 7fda5cc" automerge: fc02de4
automerge: b1ead56

* commit 'b1ead567326f331e0c03cd12f5c7155a57f49fff':