tree cebb414a699ae1c4cad7cf08cc2f72b0e55e6f40
parent a0fc8d57f906f24ee09979cb0a617f0ce240c8eb
parent 107f76215459356c8b31662ee056b7a175841b34
author Jeff Arneson <jarneson@google.com> 1426884956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426884956 +0000

am 107f7621: (-s ours) DO NOT MERGE Spit out annotations used in showAnnotations param

* commit '107f76215459356c8b31662ee056b7a175841b34':
  DO NOT MERGE Spit out annotations used in showAnnotations param