| commit | 680c8c8e43804d9bf69568d4748b3bd3a4aea0ee | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 06 16:09:04 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Sep 06 16:09:04 2012 -0700 |
| tree | 50a8fc4af2f9ff7b241b780914a8555614149da5 | |
| parent | c5fc6231312b21efb601367bae28d63f9b26ac52 [diff] | |
| parent | 33f8619677393d3d15fcb25784985009af5d7bbd [diff] |
resolved conflicts for merge of 33f86196 to stage-aosp-master Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8