tree 8000fb756cd3ece996fd986ce1b36ac2586f6f40
parent 7956af2a0bedd945644b8600f438a4dbf6668134
parent fa62b6f544032745bf66552a51b889f9bb0b42f4
author Greg Hackmann <ghackmann@google.com> 1440716185 +0000
committer android-build-merger <android-build-merger@google.com> 1440716185 +0000

Merge "Upgrade 3.4 kernel images to b1dfee2" automerge: c2b08d6
automerge: fa62b6f

* commit 'fa62b6f544032745bf66552a51b889f9bb0b42f4':