| commit | 824200b59f303de83c6ebd6fcd958e62117f665d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Nov 12 13:34:28 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Nov 12 13:34:28 2013 -0800 |
| tree | b742a648833ceacfad1418d4511e7108b364e504 | |
| parent | 6e9aeb6633e42bc7d2265f73de28e521e3fc9c21 [diff] | |
| parent | a8a055851beda66d6001df121048a7329bab5ce8 [diff] |
resolved conflicts for merge of a8a05585 to master Change-Id: I787b92631eb71f9a56e36739f7ad61133f10fa2a