tree 7d7dd36c3522ac19a9f9f9fa114268aa0de8a3e4
parent 56604046c5c46087aa5320d7c6aa6eb49c313637
parent 5d21820a979cac6d9a7426b5a5aed4b65e3cc67b
author Alex Klyubin <klyubin@google.com> 1370558723 -0700
committer Alex Klyubin <klyubin@google.com> 1370558723 -0700

resolved conflicts for merge of 5d21820a to jb-mr2-dev

Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31