| commit | 861d6348de6788b31a2d70ec84e2813df485f165 | [log] [tgz] |
|---|---|---|
| author | quddusc <quddusc@google.com> | Tue Apr 15 16:18:01 2014 -0700 |
| committer | quddusc <quddusc@google.com> | Tue Apr 15 16:18:01 2014 -0700 |
| tree | b682c248162bcfecd91d88f882ffcc9fccb64f7a | |
| parent | 7ec8b21a06364357976b6b60a12a49b255ac39eb [diff] | |
| parent | 99c3605c1d58f1f49403cef60b4121f2bc8c83d0 [diff] |
resolved conflicts for merge of 99c3605c to master Change-Id: I76383ec78cec780566256e709d3cbc371c3bd73d