tree 529ecb8a4f3f5fe5e6a199be22b94cca909c7285
parent 50f37073f8b198476373197a9dbaf4adda2402ff
parent ec698a4bb94298aa5b6d0d66f31a42d1a5674abb
author Richard Uhler <ruhler@google.com> 1449531264 -0800
committer android-build-merger <android-build-merger@google.com> 1449531264 -0800

Merge "Annotate root objects and show their types." am: 0e72abfae7
am: ec698a4bb9

* commit 'ec698a4bb94298aa5b6d0d66f31a42d1a5674abb':
  Annotate root objects and show their types.