tree c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent 854f11ac8ca942f9652b2e5db50cd794986d4d80
author Chris Craik <ccraik@google.com> 1484254580 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> 1485200590 -0800

resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
(cherry picked from commit d2fd12358d35eb999ef8b92b1dcce07f7be15fc3)