[automerger skipped] Merge "Moved transport to IntDef" am: 7b163381e2 am: 803679947b
am:254fad9ee3-s ours am skip reason: change_id I1b513bcaaa0ebf47c14593d962579ed48a7c6db0 with SHA1863427190eis in history Change-Id: Iae5ff42920f769ecfc9de290f513bd926e4de77b
This commit is contained in: