| commit | 5d7b2778d0e9849fa601d722ec2efcee7d032d4f | [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 | 22846204b0c043f47a9b103fe31c19319a3494e7 | |
| parent | b8fa1240eedeb487a7ee0cf7d60e17bed9b25cf4 [diff] | |
| parent | 41829f30e60cdb7ae8eb1f0266834d245164f70e [diff] |
resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp Change-Id: I952d333c2e88b6b28663793046a136822d1b6838