tree 782c3d3179416b3ef5f3743b2e07477dcd402220
parent 9053261a5413f401168d25fa4a9749723b232949
parent 6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb
author Deepanshu Gupta <deepanshu@google.com> 1399999235 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1399999235 -0700

resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev

Change-Id: I5c4634897882deb663f32d8148202d7c9189521d