| commit | 28a1d1c5b43361f4843956d2d17cb429b2eeda03 | [log] [tgz] |
|---|---|---|
| author | Jessica Hummel <jhummel@google.com> | Thu Jun 12 16:41:29 2014 +0100 |
| committer | Jessica Hummel <jhummel@google.com> | Thu Jun 12 16:56:09 2014 +0100 |
| tree | 4bd9105635c26a429e0893df519d8106b18d5c10 | |
| parent | b3df0c465df0251a7262efc66f7874a7f1c56f27 [diff] | |
| parent | 506ecad3a6d753309fe732869f91751ad1b61977 [diff] |
resolved conflicts for merge of 506ecad3 to master Change-Id: I1116bff0f93ee37a387b8d23cedab3f8621ae4e6