Merge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc2...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:20:31 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:20:31 +0000 (16:20 +0000)
commit2d9931312d69b2bd76665dbcb8b64660e597905a
treed175584fc02eea55d95290b8654548a59c3ea053
parent91852df673f79cc13624e2f99cd889eb4747b427
parent12c6adf6f93fee2f71eb7a82cadb730d9a136f70
Merge "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" into oc-dev-plus-aosp
am: 12c6adf6f9

Change-Id: Ia4f57e8e675b0646153bc50c59b8401dffc9cb93