tree 7ed8742be503c73f2018c2408b92adfe638cf0d0
parent 796da660120fc692a1d721f7d105aa2dc72cb62f
parent 45a1ea33a4e0eb7f1204c03611caf4699ed91d47
author Neil Fuller <nfuller@google.com> 1454084312 +0000
committer android-build-merger <android-build-merger@google.com> 1454084312 +0000

Merge "Unhide @FunctionalInterface"
am: 45a1ea33a4

* commit '45a1ea33a4e0eb7f1204c03611caf4699ed91d47':
  Unhide @FunctionalInterface