tree 11e6d5f88a6cc2eda5d06d736656fae0b08e078f
parent 559349e7b1e0ba86865c9486dc71badbc67eeccc
parent 074ee014b55e81339fe63ba5e8e005cdc047f063
author Daniel Rosenberg <drosen@google.com> 1436903256 -0700
committer Daniel Rosenberg <drosen@google.com> 1436904768 -0700

resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp

Change-Id: I346583851035950350433136599f73ab2bedba4b