| commit | 85f42727904d92fac0103a363b7788a687991414 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jun 20 16:36:47 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 20 16:36:47 2018 -0700 |
| tree | bef0b597256a76ea0d3229fabe57e7b5b1fdcf72 | |
| parent | 8012498f79edf4d0ed194848b9f2036baddcf25a [diff] | |
| parent | 375d9618f6f275f96c6cde44affe9a5799715a72 [diff] |
[automerger skipped] Merge "Merge LOCAL_STATIC_ANDROID_LIBRARIES manifests" am: 375d9618f6 -s ours Change-Id: Ia4fdb2bfd96ed04a854cd1769b4a2755d2d4fae8