tree 8539c2aa0ff3d27544e9dce66862371b418158fc
parent 212d0193b274c41ca77b7bd7d0e164ccf78afca5
parent 2ba35a93dd6d3157903e0fecf1c187a130094b5a
author Tor Norbye <tnorbye@google.com> 1436199516 +0000
committer android-build-merger <android-build-merger@google.com> 1436199516 +0000

Merge "Update bundled annotations to the latest version" into studio-1.4-dev
automerge: 2ba35a9

* commit '2ba35a93dd6d3157903e0fecf1c187a130094b5a':
  Update bundled annotations to the latest version