tree 59090ca43a53832e01668c48b8ce791407ae5d06
parent 7b8ffe2296a9ac81b73f5533457bde670e8b5d44
author Chaojing Sun <cjsun@broadcom.com> 1429735221 -0700
committer The Android Automerger <android-build@google.com> 1430256757 -0700

Cross transport key mapping fixes

Change-Id: I22d97303054eccc876c4a9c7c0a50e369ff4fa62