| commit | 1771e93797755ea8db489a42410c20c5fbf3bafc | [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 | 1fa1791a04f03e9d3a58e599233051b94cfa08a3 [diff] | |
| parent | c5972cda6cd09487e7b4f56d1ec41ebc3488924f [diff] |
Resolve merge conflicts of c5972cda6c to stage-aosp-master. Change-Id: I3ab7810e047d128a4ac088eda857c3842f2d6de8