| commit | 440fbac4947a74bbb705ad10c9e463d4bbf97a52 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Mon Jul 06 13:00:51 2015 -0700 |
| committer | Makoto Onuki <omakoto@google.com> | Mon Jul 06 13:00:51 2015 -0700 |
| tree | b235755af3549f47b3dd2c6a1f29aeaea86e0f04 | |
| parent | 0de3e83da6d83a5bff052cf54582612a0aa6513c [diff] | |
| parent | 88508e785074b945fc962d977396f48a29190d31 [diff] |
resolved conflicts for merge of 57db559d to master Change-Id: I645993fe69116f05e2275771b51a36402ba05472