tree 69082d9b5339a5746d291bb2e8f124295abf234c
parent 45c5d1a53534f6c41e369f09e4c77720bad28ca7
parent 16fbb20e739eba747c1d478a4bbcae47c7d7a421
author Elliott Hughes <enh@google.com> 1474015605 +0000
committer android-build-merger <android-build-merger@google.com> 1474015605 +0000

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

Change-Id: I751944e050b849e18c78857f64134ba54d0978eb