| commit | f68551537c1011bb537abe0cf7cc817379c043a1 | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Tue Oct 28 00:05:40 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 28 00:05:42 2014 +0000 |
| tree | 40f21c784cf9fc84347567c02834d840fc3165d9 | |
| parent | 5aad4e45d0e6666eec865ac7277406f97da02095 [diff] | |
| parent | a01188985e5b2317e22e73a3ae04b0f624ffa207 [diff] |
Merge "resolved conflicts for merge of 3bb3da96 to lmp-dev" into lmp-dev