| commit | 04cff70804810d27e1fcbef556ebfdc39278d746 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Jan 27 15:56:45 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Mon Jan 27 15:56:45 2014 -0800 |
| tree | 29aff8041d37a43365c4ce83fd967ffc78a4a7ec | |
| parent | ae49acbde766e2e683d3dd026e69f2416da766b1 [diff] | |
| parent | 7382ec7db88736ec2cb4a3236a42d2baac409827 [diff] |
resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52