tree 9ae60ef22bb12effb52a97aafc64b414d0a066ef
parent c4e146b5c6478d77c73732f041b090e37b02da07
author Marco Nelissen <marcone@google.com> 1487024380 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> 1487803431 -0800

resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643
(cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)