| commit | dad302f91a4dadda84d4329318eb83103ca6b7b5 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Nov 25 09:48:26 2014 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Tue Nov 25 09:48:26 2014 -0800 |
| tree | 1585b8c2c0584efcd8a3d4f144ac18f58b78661d | |
| parent | 14fc1aab9a062f4571a756c1709d50bb3e69ef78 [diff] | |
| parent | cb6b3cf18843991e150e74bdaf7a65d6328bd8a7 [diff] |
resolved conflicts for merge of cb6b3cf1 to lmp-mr1-dev-plus-aosp Change-Id: I09f24026a192afdc356e6fdc45386edaf9ed7455