tree 6abdbd01c9b9fb90d4ebb163f703a8ca294d7f5e
parent 9ebf8233dd497e80fdc48fdb5bce54e4eb8cbb1c
parent 5a87085f13112ce436cc5af97b9302e444a32e5e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1512699470 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1512699470 +0000

Merge changes from topic "am-4007d3bc6c424f8380499c1ff1758d7f"

* changes:
  Merge changes from topic "predicates_aosp" am: 76c275e7d3 am: 28f32f26b7 am: ff8201b34b  -s ours
  Emit all APIs using Predicates. am: bc4f48b21d am: 751de6e6bd am: c690bb763c  -s ours
  Massage APIs for upcoming doclava change. am: 983df8cc6c am: 5b89182ff8 am: d14328ff9b  -s ours