tree cfc214179471495d63f275da847ff069590e7a3f
parent 98560499aa854bc89ba0d589cc6d141d8fa77bbe
parent dbd11d6c8b3f6a1bae40dbfd050a3baf79ae5ddb
author George Mount <mount@google.com> 1506979395 +0000
committer android-build-merger <android-build-merger@google.com> 1506979395 +0000

Merge "Fix Transition test failure." into oc-mr1-dev
am: dbd11d6c8b

Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5