tree 20b3a0959d526e2bcfa943cde3339a885dffd057
parent 9a6e87648b9dcafce3630dd4510f95fce87791e3
parent c8fea2ae9859c68e3d48c4e65ada7331daab11f0
author Xavier Ducrohet <xav@google.com> 1395858195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395858195 +0000

am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-dev

* commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0':
  Add annotation support lib.