tree 77bc700e02305df3132f1ef07319e8b451704066
parent 51f84bac2813061191f205a07fec798b434ab00a
parent b376b2ccf5074faeec8833a7c2c0fbf18f558d53
author Jean-Baptiste Queru <jbq@google.com> 1359476183 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1359476196 -0800

resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev

Change-Id: I910199bb91900462e51a24b57e490ea22c6ff15a