tree 44b70719ba7a2749a82ecfa63268031f33fd8f05
parent c4da6b99626df7d16ccd28967a4af9ccd4541e21
parent 88be465ce572f84649e01744a7ec96b6346b3686
author Andrii Kulian <akulian@google.com> 1464744050 +0000
committer android-build-merger <android-build-merger@google.com> 1464744050 +0000

Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce