tree 24b0265f4f4a52923b197bdd8c2dcab71612e62e
parent 37ee4371c4735bb088b1089d540b5dbfc2c4ee2a
parent f715513048ea39867cb7189cada44fa157fc0b63
author Dan Albert <danalbert@google.com> 1478905856 +0000
committer android-build-merger <android-build-merger@google.com> 1478905856 +0000

Merge "Remove old headers and libraries." am: dd39467272 am: e09a5a158d am: b8794abb29
am: f715513048

Change-Id: Ic250b97cd72d020882c9fb439cc5411ddf5f7f24