Merge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc2...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:48:41 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:48:41 +0000 (17:48 +0000)
commitd1b976218805b74bbfd63d5620b824e905433764
treeaad755add28ec91c80292ca2400259fdc25363f0
parentd8ab3bc6f4ec27092df119df8969d4eba74396c5
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: I3e2f493da464dbf0f3ba59de5d842a61a66b233d