tree b7bd340f806ade040d9c303e386bda65dd0b9906
parent f162f4b5d952208e4b6e0a7b2e1bf01058e429b4
parent 31b0375a940a68d59a37177a5fd7614920ad0acb
author Colin Cross <ccross@android.com> 1508800351 +0000
committer android-build-merger <android-build-merger@google.com> 1508800351 +0000

Merge "Convert jsr305 to Android.bp" am: 51edc4fd26 am: 92cedd29e0
am: 31b0375a94

Change-Id: I892d846a1742b965cad5be07a2e6f94eb3e1463b