tree 8474470b13ca5ac3a5ae57f9a5280cccde6a925a
parent 310f25585994113ce6f8a89982e79f4da9827451
parent f32d23cb172a3a52aa2800b8f57d9764aa3e7105
author Deepanshu Gupta <deepanshu@google.com> 1445307788 +0000
committer android-build-merger <android-build-merger@google.com> 1445307788 +0000

Compile against the devtools annotations to fix docs build. [DO NOT MERGE] am: bcd139401c am: e1c9aff51b  -s ours am: 48e6e1b957
am: f32d23cb17  -s ours

* commit 'f32d23cb172a3a52aa2800b8f57d9764aa3e7105':
  Compile against the devtools annotations to fix docs build. [DO NOT MERGE]