tree 9acd1d85c8583398d10ad6aa3bdda22d1804244d
parent c98d1f5883ccc0eb7e424b95556fc13af15d2dfe
parent 86138731da7d96701c51131ecf6e5bb5ee72443d
author Paul Lawrence <paullawrence@google.com> 1430169276 -0700
committer Paul Lawrence <paullawrence@google.com> 1430169276 -0700

resolved conflicts for merge of 86138731 to mnc-dev-plus-aosp

Change-Id: I89203aa1665bb42f9a98fd8b94b933e8406dde02