tree 4d437f427a7b266b21d370ffc9f86963ff9b99a2
parent 16153f167407997aeadc69a80e5bd6e28b38d441
parent e906ebd3912328d8f38f371627377da97063b07b
author Jeff Gaston <jeffrygaston@google.com> 1494898572 +0000
committer android-build-merger <android-build-merger@google.com> 1494898572 +0000

Merge "Support for LOCAL_AIDL_INCLUDES in androidmk" am: b4a3288be8 am: 748e0eddc1 am: 47ccc03c05
am: e906ebd391

Change-Id: I45c4b0020df1754ba2ed907b7f481a6e54bd4bf3