tree ca1fd3449c472c01c99048736cb98a74dda6b01c
parent 241227995bb6102a0a216d9e1664a55e04d116f6
parent ee3d4d49ddcd8cd100c150091ffa85ae25e756fb
author Simon Wilson <simonwilson@google.com> 1435188164 -0700
committer Simon Wilson <simonwilson@google.com> 1435188164 -0700

resolved conflicts for merge of ee3d4d49 to mnc-dev

Change-Id: Ibfa043e2a7400e659f0355bcd139352b02a058e9