| commit | 69ca573c4938e24d8d035cb6508fa59bd02674a8 | [log] [tgz] |
|---|---|---|
| author | Sasha Levitskiy <sanek@google.com> | Tue May 12 17:29:36 2015 -0700 |
| committer | Sasha Levitskiy <sanek@google.com> | Tue May 12 17:29:36 2015 -0700 |
| tree | cf8016c36b9fbc48f6d3fd95d94cc7a2a5f86a89 | |
| parent | e00ec3aee4103a1c2d4c96ddd4f5dd4d6e5d6d69 [diff] | |
| parent | 9034ce54e3ebd25d136b428a7b664952e2464df1 [diff] |
resolved conflicts for merge of 9034ce54 to master Change-Id: I427f8cfeca25c1ca65b231ded89d2e675007e1b4