tree d22924ccf9ae9d781c3b01fcd62a13373deae6c9
parent 392804d01ce967c5ec4d00b710c7664f42c3d736
parent 6458c80c006ad5124e534ddc6d4de42811e7fb31
author Deepanshu Gupta <deepanshu@google.com> 1405721864 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1405721864 -0700

resolved conflicts for merge of 6458c80c to jb-mr1.1-docs

Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0