| commit | dfad99ad9fd5953b9d726715c40197a3e70e7dd0 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed May 07 15:21:14 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Wed May 07 15:24:01 2014 -0700 |
| tree | 9eb7839fb997db3cfe3e649d5e5c0840dae4b35b | |
| parent | b5a449e4881de2af5f0a11fbb7a9a996937811d9 [diff] | |
| parent | 0b5598c924fc140db5cfee08c17fd91e630b1c9e [diff] |
resolved conflicts for merge of 0b5598c9 to master Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893