| commit | 36efe6f8945077ff2ffe28d67043530cc991a907 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Oct 10 10:45:39 2014 -0700 |
| committer | Unsuk Jung <unsuk@google.com> | Fri Oct 10 10:45:39 2014 -0700 |
| tree | c0c7daab673fd3fa36e0b520a405701194658ab4 | |
| parent | 33859018905d9485e7342e2cc2ba0ca04b605b8e [diff] | |
| parent | b0830043e15d8b041895c659135f67dd6b6ba0ae [diff] |
resolved conflicts for merge of b0830043 to master Change-Id: Ie73868fdb8aff0534db3c45713a05cc479abb663