| commit | 53c4aff5490d858217bd8a7db1cece016d47d335 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Sep 04 10:34:54 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Sep 04 10:34:54 2013 -0700 |
| tree | 96a11e98bd932f50c6941174632ebd2faff10979 | |
| parent | e713648969863d2903c6d622e4513b5c99db6aab [diff] | |
| parent | db3d93e9c91218b672609a90e7808ef81134fc8d [diff] |
resolved conflicts for merge of db3d93e9 to jb-mr2-dev Change-Id: Ica4f4c395fd45271548b7e5354da7d5371e5a820