Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:16:50 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:16:50 +0000 (16:16 +0000)
commitf2e98c7d7dfb9614a3a0d6a5f2f47eddadc94a9e
treea04a7ca18948fbdaef7cd164a6316aa2205335a6
parenteda5da8d6cbfe10e9161b851321c79ae38d73263
parent3498ef15367ff255e9d7f2a28e6802804445ebc5
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859" into nyc-mr2-dev-plus-aosp
am: 3498ef1536

Change-Id: Id8758cffe0b5d09afdb52db8e41e697156896706