tree 73ef244f1f141ad45b795d0acbd6727f85003d3d
parent d82b7b55948739c0267333d6e0325526f5e07882
parent 05fae7e0be51ab3bc54cd62e1db9160d31bb89ea
author Dan Willemsen <dwillemsen@google.com> 1439869469 -0700
committer Dan Willemsen <dwillemsen@google.com> 1439869469 -0700

resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp

Change-Id: I32919ab1e3cd5f84d09180125a7294bcfa35549e