| commit | 8d54a6e0fa9fb4bb0a2b3b2f36d0e9bf930d05c8 | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Mon Jul 22 18:12:00 2013 -0700 |
| committer | Chiao Cheng <chiaocheng@google.com> | Mon Jul 22 18:35:49 2013 -0700 |
| tree | 5b90b38b47f545ac7a94f728c5cf9cf47c52acdd | |
| parent | 17d6b4c1f7ce789475478375416959ff35fd09cb [diff] | |
| parent | b8fb609bb80b1fd16de46a0248188fff8ca722ea [diff] |
resolved conflicts for merge of b8fb609b to jb-mr1-dev Change-Id: I336ee0b3f041f83a4b4e2c9973abb73852c2cc6f