tree a1076dce7ca3b8747f65d610a77589d09db3f0fa
parent b7bd03a9cbba4763da62af6cad6bea6978937f79
parent 4ce57af18554c2de79a76049d1c8657620995da0
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513722187 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513722187 +0000

[automerger] Merge "Improve error message on bad dao annotations." into oc-mr1-support-27.0-dev am: 8053a79737 am: 4ce57af185

Change-Id: I8d0d80d36d3da5b331209319e5cc3c704f2af69a