tree 6011bf2ed3c90eb57f4cc0c9fb783d95f9a1fd74
parent 3e64bf45e65641c0dd946de6eefa552718f14c1c
parent ae413a71cb7201a08d7e9a8b051b8d2ea61207ed
author Paul Lawrence <paullawrence@google.com> 1412886246 -0700
committer Paul Lawrence <paullawrence@google.com> 1412886246 -0700

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

Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141