tree c897175c61c814364df8ff9cd733571ae7eeb334
parent fc7c804f971f7177a8011be9ae944ca9f9d65000
parent 17c08badc59aa0e1a02b09d5e268a25752c89423
author Alex Vakulenko <avakulenko@google.com> 1444778299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444778299 +0000

am 7d85a6a5: Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"

* commit '7d85a6a56867c0380a0f652e3dd59abeff4f2baa':
  system/core: Rename "chromeos" -> "brillo" in include paths and namespaces