| commit | 605103fb553a8b872aa8dd0aef76ae8b3bfe47fa | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Aug 13 10:21:35 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Aug 13 10:21:35 2012 -0700 |
| tree | aa2c23c9e87c1872ef7aacc70b446455da1704bd | |
| parent | 98ebf1975f68ffeaa43d5c53964c3dabe8655562 [diff] | |
| parent | 4dcd52ab11d25fe3d53aab52b6c233e692da4eae [diff] |
resolved conflicts for merge of 4dcd52ab to jb-mr1-dev Change-Id: Ibd0c03a7883a2e31adab18543c016776b7b36866