tree 13c06a325224c2d8c8d3445471eb7c47272aa948
parent 159a9307ed89a6eaa82b7c94901e1796471502a5
parent 3a2bce6e51b08d276806cc60fb1a410e63b4e17e
author Jack Yu <jackyu@google.com> 1460505021 +0000
committer android-build-merger <android-build-merger@google.com> 1460505021 +0000

Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
am: 3a2bce6

* commit '3a2bce6e51b08d276806cc60fb1a410e63b4e17e':
  Moved ERI configuration files from resoures to Carrier Config.

Change-Id: Ib9289d40191c205cfa95560b5a38f8fe8dfeef80