| commit | de29bee23b2de8347f24287f4b04be89a7f55dab | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 16:06:51 2015 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Aug 20 16:10:48 2015 -0700 |
| tree | f24ea77cdcfd722908600438e3d7c1571edc47f8 | |
| parent | a3e159db52c3ad069d65dfb85b97d6338487b846 [diff] | |
| parent | 69a4f94967fe9dedff867e964c1db1e36ce73339 [diff] |
resolved conflicts for merge of 69a4f949 to mnc-dev-plus-aosp Change-Id: I7eada1ff8c56c06d9de16009136b35115bc4a43a