tree 1e119483556fe1471e1c0c385cac4ab97921f002
parent f7cd79ec16a8aebca9343eba30f0d73cb00cca88
parent c75164b9426fc705dcb660dee5176ec6303d4997
author Elliott Hughes <enh@google.com> 1474015457 +0000
committer android-build-merger <android-build-merger@google.com> 1474015457 +0000

Merge "Stop including libcore/include/ in frameworks/av." am: adc9ba6520
am: c75164b942

Change-Id: I93f9b2360e4bc50b9596cb02749d753ac282c3e5