| commit | 5dd0a57f26c6c8dadc35454e69813145141386c4 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Tue Nov 27 15:05:48 2012 -0800 |
| committer | Glenn Kasten <gkasten@google.com> | Tue Nov 27 15:06:21 2012 -0800 |
| tree | f93944b829454836c0be7e602f6756243bc7cfe5 | |
| parent | edac45119a3f37e3092911224385a390c123040e [diff] | |
| parent | 5ad21fb5686d4d32f61a47eab5a3fd2c4670e32d [diff] |
resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp Change-Id: I952d333c2e88b6b28663793046a136822d1b6838