tree 975bff3addce4062cb4227f7d96d1f36a16c7ed0
parent ddb605d4b2fa544bab69a72a288e578f2dd37f52
parent 6c585756b4c66058af85bb8d6524ffa94af79e62
author Dan Albert <danalbert@google.com> 1410240354 -0700
committer Dan Albert <danalbert@google.com> 1410240354 -0700

resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp

Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96