| commit | d3f51b0ed62fceb463402273d6bdb2e07061c8b8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Apr 28 21:52:17 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 28 21:52:18 2015 +0000 |
| tree | 9556858f191628ba2f8fa27c31513d5d1bff8751 | |
| parent | b53672ca6d843a64396b0ff135b31bd3da45857c [diff] | |
| parent | 5c14c99bbdb3407341285f2d13185c551627c5ca [diff] |
Merge "resolved conflicts for merge of 44204f68 to lmp-mr1-dev" into lmp-mr1-dev