tree 48e36972178ec5d5217a79c54bf5d01718c0ccc7
parent b876d63a16d38de39ad1e232cd112c6eef2b1e09
parent 61aa5ecc0e3bda03025db62486ef2afd3471ccad
author Dan Albert <danalbert@google.com> 1503443499 +0000
committer android-build-merger <android-build-merger@google.com> 1503443499 +0000

Merge "Remove pre-ICS crap."
am: 61aa5ecc0e

Change-Id: I90c668fd5b869171a7926444ae171ead4b8cd360