tree 460582c3084a12a56f6ed5ca692d620c94972233
parent c0536289c3e86a4ff106a30487fcdcde458a92fe
parent cbf5e23369f34261a64bcfae59edfd579c486a04
author Colin Cross <ccross@android.com> 1506995385 +0000
committer android-build-merger <android-build-merger@google.com> 1506995385 +0000

Merge "Delete jack support" am: 0e82eea2d4  -s ours am: 2f2ea24780
am: cbf5e23369

Change-Id: I46b8e5915e1b34345f6aa636d4a70062edc0457e