tree 441668cd11c0f024d44c60c6a26b594877c396b8
parent 0de821b0b10bbf3404827f21bfa9a2489d7358c5
parent 0ac38a4e5ee55f55ab3e8a895be53bd0d04dcf47
author Elliott Hughes <enh@google.com> 1344711651 -0700
committer Elliott Hughes <enh@google.com> 1344711651 -0700

resolved conflicts for merge of 0ac38a4e to jb-mr1-dev

Change-Id: I0978f511f807797f89be4002bca654492231761c