| commit | fb66a101aef83ff9b9b8e6e02e9588eadfd00d98 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Feb 24 13:07:32 2016 -0800 |
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Feb 24 13:07:32 2016 -0800 |
| tree | 01e3ae8cbf5a8fcb7f331a6cd06abe90b2adc11c | |
| parent | 0840b2246a001d3e9f8f795c01144b59cf404826 [diff] | |
| parent | 57627d0e47afd779b736fe402fb33a8c3fe93a72 [diff] |
Resolve merge conflicts of c5972cda6c to stage-aosp-master. Change-Id: I3ab7810e047d128a4ac088eda857c3842f2d6de8