tree cbffaa9f10f2f6aff7354dfedead605313944d3b
parent fa614dc3fd88db10ecad84af7dd7d9a1156310a1
parent 31d86deb7cdb5ceeca1d793d9c7ad54da603fa38
author Jack Yu <jackyu@google.com> 1460504599 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460504604 +0000

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