| commit | c8c82009dc8c146efadac6b51702922148f6003f | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue May 28 15:43:16 2013 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Tue May 28 15:43:16 2013 -0700 |
| tree | b99ad196c60c4f204bf0bb5f231594dffc43a694 | |
| parent | 79df1e65455fdb69f07675cffae99dea06a5afb2 [diff] | |
| parent | 7573e5947a643dd8b8a97ee9dbf1dab398ad4ea7 [diff] |
resolved conflicts for merge of 7573e594 to stage-aosp-master Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f