Commits
Elliott Hughes authored and Android Git Automerger committed 3c73845aaafM
am 17b4be07: (-s ours) am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." * commit '17b4be07fed91da2f770be87f66b1e8918dff52f':
Showing diff to9b771ef261f