| commit | 880d3f39f711f9ca6d2ba5c9cf127265fa39efad | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Aug 11 12:00:51 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Sat Aug 11 12:00:51 2012 -0700 |
| tree | 441668cd11c0f024d44c60c6a26b594877c396b8 | |
| parent | 0de821b0b10bbf3404827f21bfa9a2489d7358c5 [diff] | |
| parent | 0ac38a4e5ee55f55ab3e8a895be53bd0d04dcf47 [diff] |
resolved conflicts for merge of 0ac38a4e to jb-mr1-dev Change-Id: I0978f511f807797f89be4002bca654492231761c