tree 1e9ab7f4836f6b72f868cc0fd0a0127511b49e05
parent eb395c93ee3dc773d2b96611921e9f9531f3b48c
parent 41c1c2a0f4b40dc723f6a831957fe8ba6faeb5bf
author Colin Cross <ccross@android.com> 1512416300 +0000
committer android-build-merger <android-build-merger@google.com> 1512416300 +0000

Merge "Export AIDL files as a filegroup for framework.jar" am: ec92cd91f7  -s ours am: 20eb8c9f34  -s ours
am: 41c1c2a0f4  -s ours

Change-Id: I27e3ceaeb2a093107ce999e85979cbb9693372e5