tree 55279b98607b1bfc1f12f04d375e73cf46b46931
parent 9650b930a300b3822bb12ed8d934a9f75bc4577d
parent 96c834380e93f3bd4b8524199b0842240b3e0957
author Jeff Sharkey <jsharkey@android.com> 1438896129 -0700
committer Jeff Sharkey <jsharkey@android.com> 1438896166 -0700

resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp

Change-Id: Ieaa0dcd8e93fba3060e9a85f17b1f5eabc6b8c9e