tree 2e7c3c910aebf933d713d047218fc46c5296e269
parent 51c6ad178e723a4cd59a143dd48d81ccdce2d489
parent 79f338465213885900cea5a39f3aeeea083bbe51
author Ed Tam <etam@google.com> 1428967745 -0700
committer Ed Tam <etam@google.com> 1428967745 -0700

resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp

Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280