tree 2de38f65bf44f72bb934d6c18bfedee3dae5c0ff
parent 51942bedde56abe862f4d13af9ee27b916175d23
parent 836476d90d77d13664f54765696da065c710c1a9
author Elliott Hughes <enh@google.com> 1449623868 -0800
committer Elliott Hughes <enh@google.com> 1449623868 -0800

resolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.

Change-Id: I8ae0ceb96f8bfe706cdaa4a512bf52935667600c