| commit | b3af535adec8003d42c38d289ca514c92373c1fe | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jun 24 13:02:49 2014 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Tue Jun 24 13:02:49 2014 +0100 |
| tree | 5b62f8bffd84cd198f19d64170794e9037290d82 | |
| parent | 71b676bc953b91209b3eb8b142153367222c0abd [diff] | |
| parent | 816cff12e1864c4e3d2a9bdc5f57b4b8cc03ac86 [diff] |
resolved conflicts for merge of 816cff12 to master Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f