| commit | 252a5c854a08e89fc7337ea679220161fe4ea98f | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Sat Jun 02 08:14:36 2012 -0700 |
| committer | Iliyan Malchev <malchev@google.com> | Sat Jun 02 08:14:36 2012 -0700 |
| tree | 8e0e154a5c1c94613138ba8cee0b77b8e34d0a49 | |
| parent | f0ddaa2fac00ac20059c0b2c142da9de2838a7b6 [diff] | |
| parent | e1dd3c287ba836281de0197670018bd9bbfbd62b [diff] |
resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp Change-Id: I58b9c13d20771aa39b703ec05cbff8aeaad38fe8