| commit | 40f92f2e5ca86bf0a902325f20d832d86f2d934a | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Jul 30 10:05:16 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed Jul 30 10:05:16 2014 -0700 |
| tree | 717eecd5acdbdf3fa8f15ac5a2dcecc853be7276 | |
| parent | 4a5a11e416425689d9f37a1963ae852051b451d2 [diff] | |
| parent | fe07e79113a12dd2d3c084d5e0c5d72d7026161b [diff] |
resolved conflicts for merge of fe07e791 to lmp-dev-plus-aosp Change-Id: I9215d5a4ffacb295addc4349dd028ccbfba71730