| commit | fa4865f680cc151ff051b7a82fb0e94145d70377 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Wed Oct 10 11:09:03 2012 -0700 |
| committer | Katie McCormick <kmccormick@google.com> | Wed Oct 10 11:09:03 2012 -0700 |
| tree | 13701c23beed5c112655da66b8ecafe63553ef3a | |
| parent | c2e3be5a8bcd3be2d6cb6fda0cda28bc87d7814d [diff] | |
| parent | 0b479e43798e9225206f41820fe0e56db8de5f32 [diff] |
resolved conflicts for merge of 0b479e43 to jb-dev Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e