| commit | c1a8e1ec87d74dbb167ff575e8507183045584cd | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue Oct 09 13:42:07 2012 -0700 |
| committer | Raphael Moll <raphael@google.com> | Tue Oct 09 13:44:41 2012 -0700 |
| tree | 979627b7d6a6e79204c71114310a2a5629e0e2c2 | |
| parent | 41ee0fdc33391aa19d26f6f068fca44c48151987 [diff] | |
| parent | d6308897c00e55fe1f56c9a513c15445342518b7 [diff] |
resolved conflicts for merge of d6308897 to jb-mr1-dev Change-Id: Iffbbb75a504e5f8b0caa5690835e17a4b6ab63bb