[automerger skipped] Fix import of android-support-annotations am: 97f0b1979b
am: be834c40f0  -s ours

Change-Id: I40249a26ce296e29a3ea674692c9ebaac67549c2
tree: 448e751e392daacde7f5e26b901cdc2076c42e71
  1. library/
  2. navigationbar/
  3. tools/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg