tree a13af078fdf4dfc0373934ac69cf1e1b72a57655
parent 9bc9469807703757f50fffd34ed6b3f6183cdc6e
parent d0694da4fb85bb01e7c0ea7989a78a0e635453ac
author Tyler Gunn <tgunn@google.com> 1438358552 -0700
committer Tyler Gunn <tgunn@google.com> 1438358552 -0700

resolved conflicts for merge of d0694da4 to mnc-dr-dev

Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a