tree 230e918cee633aa61318edf50e902c44e4a84fde
parent 9f905f37b229294753ef08ee104a00f611de450f
parent 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea
author Andreas Gampe <agampe@google.com> 1412231683 -0700
committer Andreas Gampe <agampe@google.com> 1412231741 -0700

resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp

Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92