Merge "Report Android extension pack tests as not supported" am: 03c395c60f am: 714fd...
authorMika Isojarvi <misojarvi@google.com>
Fri, 14 Jul 2017 22:31:29 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 22:31:29 +0000 (22:31 +0000)
am: df941fbf52

Change-Id: I1f76402507ba15ebef1eb75a357fc55797d128f9


Trivial merge