tree ca81268bd29cd805cd3c3f4fbaa94da8698f32fb
parent 0e750eb0750150904c005a2a68e49ba2993913eb
parent f0fe1779c991fbc158c5d06d0c67accb7107d42b
author Colin Cross <ccross@android.com> 1491935938 +0000
committer android-build-merger <android-build-merger@google.com> 1491935938 +0000

Replace custom annotation processor handling am: 8e31c1039e
am: f0fe1779c9

Change-Id: Icbada5f37c11e07a0d872e0274a6603c90509a5c