tree 6981915ec5669c58ceac856f65bd481e76876b66
parent e2a2324ade6f5ce5ac0a95f2f51052963df80175
parent 51f523b9ecf02296ebef7c93dcfdca6ee2d8ea22
author Alex Klyubin <klyubin@google.com> 1417732370 -0800
committer Alex Klyubin <klyubin@google.com> 1417732370 -0800

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

Change-Id: I6408a8ed19f3d676d1b0da3e4f7f29541b5d4dc8