tree e1cff4c67e49c654553edb499864cdd3a48776e8
parent 2b4632b580c756af046ee4b9a6ecc77a01388d4e
parent e5e18cca3eefccf3a6aabd254ceb2c59f120a7d2
author Elliott Hughes <enh@google.com> 1439422746 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1439422746 +0000

Merge "Lose HAVE_ANDROID_OS in frameworks/rs."