tree b8566973a667dbff9d461aa42fc439e3a3d345e1
parent cb859cdfa107ab81bd695c57230c4064b9ac39ab
parent 62a09752e6187e820d51c684ca8baf733289444d
author Ian Rogers <irogers@google.com> 1414714937 -0700
committer Ian Rogers <irogers@google.com> 1414714937 -0700

resolved conflicts for merge of 62a09752 to lmp-mr1-dev-plus-aosp

Change-Id: Icfe0e7a29c2155b3b26b7068114098e0d30beaff