tree 1461cdac298f3376becd08e4490b9f1174770fb5
parent 478bca2e728c108158fd68b469b3a48e2a432ad9
parent 3ecba7f95cc12051efa93b4c73c012c9f748c885
author Elliott Hughes <enh@google.com> 1440526918 -0700
committer Elliott Hughes <enh@google.com> 1440526918 -0700

resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp

Change-Id: I46452c03bbda9604f2af2e1edce5d48c6865d436