commit | ef680b6c56b8d975a96b30f02ab92df851df0168 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Thu Jan 19 19:35:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 19 19:35:13 2017 +0000 |
tree | 1162e84af0d37ef2d160559f31eee13adec24ce5 | |
parent | 61541a2b27a7b634b30523ac40775b1925ad1a26 [diff] | |
parent | 3490714a553ab88a982ed835f1e5989906e54562 [diff] |
Merge "Merge "CTS: Fix issue with StaticMetadataTest#testCapabilities" into lollipop-mr1-cts-dev am: 56126aa03f" into marshmallow-cts-dev am: 3490714a55 Change-Id: I7f10bf215c7e9ebc9e483465a839e022bf69ea77