| commit | 16ba2ed82bc084d5355477a381cc0bcc8b60a7bd | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Feb 04 11:28:56 2015 -0800 |
| committer | Ying Wang <wangying@google.com> | Wed Feb 04 11:28:56 2015 -0800 |
| tree | 742bfd2bf13d8b399bfdd78fd684213dd19768ca | |
| parent | e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa [diff] | |
| parent | 4c178ebcc0069b6f806de4df491bc9a7e1b9d78e [diff] |
resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2