| commit | 07be5025d9aa881cc055dc65789dc9ccf1c04b38 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Tue Oct 27 16:48:38 2015 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Tue Oct 27 16:48:38 2015 -0700 |
| tree | ea08b48befdbeff744f3701a1f56e7dee3a0c03e | |
| parent | a9373f8e24d61b3c338477139feb4b6508203eb5 [diff] | |
| parent | b5775d97b424f4119fcb413fb73e3db1032a7cb0 [diff] |
resolve merge conflicts of b5775d97b4 to master. Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6