tree 649a68f43e6ea20e95f4c08cd5eda707f4848829
parent d30408a63131621a03acabacbe713742e0c54e1a
parent 5b3ac41821fa3c8ab3c5b81a97bc04f8853e9b96
author Colin Cross <ccross@android.com> 1487194650 +0000
committer android-build-merger <android-build-merger@google.com> 1487194650 +0000

Merge "Add dependency on android-support-annotations" am: 9f014f67b1 am: b976e999cf
am: 5b3ac41821

Change-Id: I590a2bd506f0db8661306fe27d3e6490787915fb