| commit | bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Oct 04 11:39:00 2012 -0700 |
| committer | Scott Main <smain@google.com> | Thu Oct 04 11:39:00 2012 -0700 |
| tree | 9fc36ca605b2e409cc04622ef457f3028a5330a1 | |
| parent | 6b962174bf974edd5298a37498777780e0b7b1fe [diff] | |
| parent | 78866b71e6c10f8c63f5e333cf9c083d342799a0 [diff] |
resolved conflicts for merge of 78866b71 to jb-dev Change-Id: I028637f4622f398769ad43e714d45ec95ff3f23d