tree fd234e68c6538a9c3d7baaa5a2591206127f3642
parent 2bf0ba2dcf0c9f8417807e9688c652ff33e495dc
parent c576c08fd594badde8e2c8bc6fd27ce3445efc7d
author Dan Willemsen <dwillemsen@google.com> 1439342503 -0700
committer Dan Willemsen <dwillemsen@google.com> 1439342503 -0700

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

Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101