tree 43450c1eac28607a99168eeacf7988e2be1c3ebe
parent ed1e43bf24db3946eda11e429727b1177852779c
parent fdcf8ed651071c8d88e4302ebf83850d766e2c1a
author Elliott Hughes <enh@google.com> 1470874469 +0000
committer android-build-merger <android-build-merger@google.com> 1470874469 +0000

Merge "Move brillo closer to Android." am: 299e501419
am: fdcf8ed651

Change-Id: I05fd1e19e551d16956e558d5fd2e5a3a6b8f8ed3