| commit | 10500d0ea7706a6a137e8afdd347d927f5512488 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Jan 30 16:57:37 2015 -0800 |
| committer | Ying Wang <wangying@google.com> | Fri Jan 30 16:57:37 2015 -0800 |
| tree | fe0c4b773553f9dca2703de6bc99ab912e5b5f38 | |
| parent | 5cfcf91feabb72170840c1bf76f626b2d4657e38 [diff] | |
| parent | 5cb4276e48d84b66ad797f847361644af1b5754e [diff] |
resolved conflicts for merge of 5cb4276e to lmp-mr1-dev-plus-aosp Change-Id: Ia7f011f24276e7e8e045a2544e5dff2b758b1c62