| commit | 24912dc446439b0aaa1c3417a8159af758f76ff6 | [log] [tgz] |
|---|---|---|
| author | Riley Andrews <riandrews@google.com> | Thu Jun 26 20:49:46 2014 -0700 |
| committer | Riley Andrews <riandrews@google.com> | Thu Jun 26 20:49:46 2014 -0700 |
| tree | 50641f8d106f57546030e20b17268e643eb105a0 | |
| parent | f67d6bd3c0fb41d167c675b9d2b5d377b6f38a74 [diff] | |
| parent | fa6f25432b45958af870674529ce79e84986e0fa [diff] |
resolved conflicts for merge of fa6f2543 to master Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d