| commit | 5727eeebd6f7afc15b773dd851a121f51a4ccd75 | [log] [tgz] |
|---|---|---|
| author | Scott Kennedy <skennedy@google.com> | Thu Mar 14 13:11:56 2013 -0700 |
| committer | Scott Kennedy <skennedy@google.com> | Thu Mar 14 13:11:56 2013 -0700 |
| tree | ab346b5390fb1f343ef582425d01ad59a0265685 | |
| parent | 4aa10b1bc14290397756b05e97ff9bc8a3b7564b [diff] | |
| parent | 35d3af70da9740a81eb8eda5a7f87e6f396fb151 [diff] |
resolved conflicts for merge of 35d3af70 to jb-mr2-dev Change-Id: If85946ef3dbf82eb3a790adf320765e4a25d91dc