tree 1f7f46fcd411d500e117a15f56f1f1446b2fdc70
parent 40a825d4d9f030ccd6ff8e4a22ea1bcca303eb73
parent e8092c184fa5922ba2515769477c7174361dc5ad
author Orion Hodson <oth@google.com> 1507119977 +0000
committer android-build-merger <android-build-merger@google.com> 1507119977 +0000

Merge "Bump API level required for const-method-{handle,type}" am: a5da5b9d92
am: e8092c184f

Change-Id: Iec4154fc9278c359a73f4b09e24acf18a64eff41