| commit | a7a51a397e3500b91649bb5a46e7169865151515 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Fri Mar 22 13:05:32 2013 -0700 |
| committer | Raphael Moll <raphael@google.com> | Fri Mar 22 13:05:32 2013 -0700 |
| tree | 5341036fea1ea8982f7423407b75369b08695fa8 | |
| parent | 11ad495f11f17a1f2912e0c9e4b915ae5ad6cce9 [diff] | |
| parent | 9583d2ed3ae085ad38dd78167878ed00becb387a [diff] |
resolved conflicts for merge of 9583d2ed to jb-mr2-dev Change-Id: Ib6c5f18a2b6429ef8bbca577e8cabcab26dc6ca1