tree 84c6fe3c5e58781c54ce34961d9152d370919dae
parent 8268ad6779c38fb67ea3783fd57bf71bb0cccc51
parent 2008cff73bbc816f867dac0cd057899bed714356
author Elliott Hughes <enh@google.com> 1410206923 -0700
committer Elliott Hughes <enh@google.com> 1410206923 -0700

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850