From 841c633fa13ba8d48563fbda247e75bab3bd6f49 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sat, 19 Jul 2014 20:15:42 -0700
Subject: [PATCH] resolved conflicts for merge of b5bef263 to lmp-dev-plus-aosp

.

Change-Id: Ieef30b3a308ca3cad4a59f17566d4cede0ae2b16