tree 126bd61eab6073750b459cc9f1feb557e0dfaa3e
parent d80259ec9b1b171d5507ea741071b903281134de
parent 7982495f79f293e893a266bbb7890fee4a691395
author Rom Lemarchand <romlem@android.com> 1433290962 -0700
committer Rom Lemarchand <romlem@google.com> 1433290962 -0700

resolved conflicts for merge of 7982495f to mnc-dev-plus-aosp